Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[~andy/linux] / drivers / net / pcmcia / Kconfig

diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
index 5d658bc9791ce147ab5bf2c8f8235bb1164c0640..e8f55d8ed7a900f86329e72e682c1f0f3023b02c 100644 (file)
--- a/drivers/net/pcmcia/Kconfig
+++ b/drivers/net/pcmcia/Kconfig
@@ -19,7 +19,7 @@ menuconfig NET_PCMCIA
 
          If unsure, say N.
 
-if NET_PCMCIA
+if NET_PCMCIA && PCMCIA
 
 config PCMCIA_3C589
        tristate "3Com 3c589 PCMCIA support"