Merge branch 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

[karo-tx-linux.git] / drivers / pcmcia / Kconfig

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index f3ccbccf5f21f86690ae1d7b5893678f860d8da0..cd5082d3ca19272294410fa8b45f82b9aa6b9494 100644 (file)
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -179,7 +179,7 @@ config PCMCIA_BCM63XX
        depends on BCM63XX && PCMCIA
 
 config PCMCIA_SOC_COMMON
-       bool
+       tristate
 
 config PCMCIA_SA1100
        tristate "SA1100 support"