Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 242479
b: refs/heads/master
c: 62d0086
h: refs/heads/master
i:
  242477: b774a5e
  242475: 0686a49
  242471: 9f1c9f2
  242463: 32f117a
v: v3
  • Loading branch information
Linus Torvalds committed Mar 26, 2011
1 parent 405c6db commit 7934d01
Show file tree
Hide file tree
Showing 8 changed files with 1,112 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c8fb4022cf61a0462ad01525e0b3dd00410e9eac
refs/heads/master: 62d00867514ae1c81ab5e809e189ca159536daee
5 changes: 5 additions & 0 deletions trunk/MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions trunk/drivers/memstick/host/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
1 change: 1 addition & 0 deletions trunk/drivers/memstick/host/Makefile
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
Loading

0 comments on commit 7934d01

Please sign in to comment.