---

yaml --- r: 242430 b: refs/heads/master c: 4bafad9 h: refs/heads/master v: v3
git-mirror · Mar 25, 2011 · a21d0e4 · a21d0e4
1 parent 553172c
commit a21d0e4
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 1,112 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be4d250ab41e13f8f945be6896695e870b38ba31
+refs/heads/master: 4bafad922ab480d5f86052e679abf5c3ca6dbfa7
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -5291,11 +5291,6 @@ 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/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
@@ -862,6 +862,9 @@ config GPIO_TXX9
 config CFE
 	bool
 
+config ARCH_DMA_ADDR_T_64BIT
+	def_bool (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT
+
 config DMA_COHERENT
 	bool
 

diff --git a/trunk/drivers/memstick/host/Kconfig b/trunk/drivers/memstick/host/Kconfig
@@ -30,15 +30,3 @@ 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,4 +4,3 @@
 
 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,4 +4,3 @@

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