---

yaml --- r: 14027 b: refs/heads/master c: 77c44ab h: refs/heads/master i: 14025: 524ecf4 14023: d3facca v: v3
git-mirror · Nov 14, 2005 · 4f757a7 · 4f757a7
1 parent 44a5e19
commit 4f757a7
Show file tree

Hide file tree

Showing 6 changed files with 908 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bca73e4bf8563d83f7856164caa44d5f42e44cca
+refs/heads/master: 77c44ab1d8e9da31bf927223e1579b44f772b579
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -1873,6 +1873,11 @@ L:	linux-tr@linuxtr.net
 W:	http://www.linuxtr.net
 S:	Maintained
 
+OMNIKEY CARDMAN 4040 DRIVER
+P:	Harald Welte
+M:	laforge@gnumonks.org
+S:	Maintained
+
 ONSTREAM SCSI TAPE DRIVER
 P:	Willem Riede
 M:	osst@riede.org

diff --git a/trunk/drivers/char/pcmcia/Kconfig b/trunk/drivers/char/pcmcia/Kconfig
@@ -18,5 +18,18 @@ config SYNCLINK_CS
 	  The module will be called synclinkmp.  If you want to do that, say M
 	  here.
 
+config CARDMAN_4040
+	tristate "Omnikey CardMan 4040 support"
+	depends on PCMCIA
+	help
+	  Enable support for the Omnikey CardMan 4040 PCMCIA Smartcard
+	  reader.
+
+	  This card is basically a USB CCID device connected to a FIFO
+	  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/).
+
 endmenu
 
diff --git a/trunk/drivers/char/pcmcia/Makefile b/trunk/drivers/char/pcmcia/Makefile
@@ -5,3 +5,4 @@
 #
 
 obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o
+obj-$(CONFIG_CARDMAN_4040) += cm4040_cs.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@
		#

		obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o
		obj-$(CONFIG_CARDMAN_4040) += cm4040_cs.o