---

yaml --- r: 242427 b: refs/heads/master c: 9263412 h: refs/heads/master i: 242425: dc45c00 242423: 4a42f54 v: v3
git-mirror · Mar 26, 2011 · c9f34cd · c9f34cd
1 parent 45c7f93
commit c9f34cd
Show file tree

Hide file tree

Showing 6 changed files with 1,102 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40471856f2e38e9bfa8d605295e8234421110dd6
+refs/heads/master: 9263412501022fecef844907129ee2513b5a89de
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -5291,6 +5291,11 @@ S:	Maintained
 F:	drivers/mtd/nand/r852.c
 F:	drivers/mtd/nand/r852.h
 
+RICOH R5C592 MEMORYSTICK DRIVER
+M:	Maxim Levitsky <maximlevitsky@gmail.com>
+S:	Maintained
+F:	drivers/memstick/host/r592.*
+
 RISCOM8 DRIVER
 S:	Orphan
 F:	Documentation/serial/riscom8.txt

diff --git a/trunk/drivers/memstick/host/Kconfig b/trunk/drivers/memstick/host/Kconfig
@@ -30,3 +30,15 @@ config MEMSTICK_JMICRON_38X
 
           To compile this driver as a module, choose M here: the
 	  module will be called jmb38x_ms.
+
+config MEMSTICK_R592
+	tristate "Ricoh R5C592 MemoryStick interface support (EXPERIMENTAL)"
+	depends on EXPERIMENTAL && PCI
+
+	help
+	  Say Y here if you want to be able to access MemoryStick cards with
+	  the Ricoh R5C592 MemoryStick card reader (which is part of 5 in one
+		multifunction reader)
+
+	  To compile this driver as a module, choose M here: the module will
+	  be called r592.
diff --git a/trunk/drivers/memstick/host/Makefile b/trunk/drivers/memstick/host/Makefile
@@ -4,3 +4,4 @@
 
 obj-$(CONFIG_MEMSTICK_TIFM_MS)		+= tifm_ms.o
 obj-$(CONFIG_MEMSTICK_JMICRON_38X)	+= jmb38x_ms.o
+obj-$(CONFIG_MEMSTICK_R592)		+= r592.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,4 @@

		obj-$(CONFIG_MEMSTICK_TIFM_MS) += tifm_ms.o
		obj-$(CONFIG_MEMSTICK_JMICRON_38X) += jmb38x_ms.o
		obj-$(CONFIG_MEMSTICK_R592) += r592.o