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

[linux-2.6-omap-h63xx.git] / drivers / char / pcmcia / Kconfig

diff --git a/drivers/char/pcmcia/Kconfig b/drivers/char/pcmcia/Kconfig
index 27c1179ee52749a7062c597e71f506321eeb7287..ffa0efce0aed06aa51be310e14dfe4b5bac8c3b4 100644 (file)
--- a/drivers/char/pcmcia/Kconfig
+++ b/drivers/char/pcmcia/Kconfig
@@ -21,6 +21,7 @@ config SYNCLINK_CS
 config CARDMAN_4000
        tristate "Omnikey Cardman 4000 support"
        depends on PCMCIA
+       select BITREVERSE
        help
          Enable support for the Omnikey Cardman 4000 PCMCIA Smartcard
          reader.
@@ -42,5 +43,14 @@ config CARDMAN_4040
          (http://www.omnikey.com/), or a current development version of OpenCT
          (http://www.opensc.org/).
 
+config IPWIRELESS
+       tristate "IPWireless 3G UMTS PCMCIA card support"
+       depends on PCMCIA && NETDEVICES
+       select PPP
+       help
+         This is a driver for 3G UMTS PCMCIA card from IPWireless company. In
+         some countries (for example Czech Republic, T-Mobile ISP) this card
+         is shipped for service called UMTS 4G.
+
 endmenu