Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

[linux-2.6] / arch / um / Kconfig

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 5982fe2753e0286382aa07ba35ba831b98cb2285..05fbb20636cbe0126b1c86d6f02e5987533e6e82 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -22,6 +22,9 @@ config SBUS
 config PCI
        bool
 
+config PCMCIA
+       bool
+
 config GENERIC_CALIBRATE_DELAY
        bool
        default y