Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

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

diff --git a/drivers/char/pcmcia/Kconfig b/drivers/char/pcmcia/Kconfig
index f25facd97bb45a7af74e1268c45dec99f2cb04a0..6614416a86232270f085bdc4af60d6bf18f59ddf 100644 (file)
--- a/drivers/char/pcmcia/Kconfig
+++ b/drivers/char/pcmcia/Kconfig
@@ -28,7 +28,7 @@ config CARDMAN_4000
 
          This kernel driver requires additional userspace support, either
          by the vendor-provided PC/SC ifd_handler (http://www.omnikey.com/),
-         or via the cm4000 backend of OpenCT (http://www.opensc.com/).
+         or via the cm4000 backend of OpenCT (http://www.opensc-project.org/opensc).
 
 config CARDMAN_4040
        tristate "Omnikey CardMan 4040 support"
@@ -41,7 +41,16 @@ config CARDMAN_4040
          in I/O space.  To use the kernel driver, you will need either the
          PC/SC ifdhandler provided from the Omnikey homepage
          (http://www.omnikey.com/), or a current development version of OpenCT
-         (http://www.opensc.org/).
+         (http://www.opensc-project.org/opensc).
+
+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