Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 64ddc44d0b81ebfe9db5e72d4e7f945195276c15..a9e15403434ef9adcec951800048752b8cbb1275 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -39,6 +39,9 @@ config GENERIC_IO
        boolean
        default n
 
+config STMP_DEVICE
+       bool
+
 config CRC_CCITT
        tristate "CRC-CCITT functions"
        help