mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
memstick: add support for JMicron jmb38x MemoryStick host controller
Signed-off-by: Alex Dubov <oakad@yahoo.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
593672582e
commit
60fdd931d5
@@ -8,7 +8,7 @@ menuconfig MEMSTICK
|
|||||||
Sony MemoryStick is a proprietary storage/extension card protocol.
|
Sony MemoryStick is a proprietary storage/extension card protocol.
|
||||||
|
|
||||||
If you want MemoryStick support, you should say Y here and also
|
If you want MemoryStick support, you should say Y here and also
|
||||||
to the specific driver for your MMC interface.
|
to the specific driver for your MemoryStick interface.
|
||||||
|
|
||||||
if MEMSTICK
|
if MEMSTICK
|
||||||
|
|
||||||
|
|||||||
@@ -20,3 +20,13 @@ config MEMSTICK_TIFM_MS
|
|||||||
To compile this driver as a module, choose M here: the
|
To compile this driver as a module, choose M here: the
|
||||||
module will be called tifm_ms.
|
module will be called tifm_ms.
|
||||||
|
|
||||||
|
config MEMSTICK_JMICRON_38X
|
||||||
|
tristate "JMicron JMB38X MemoryStick interface support (EXPERIMENTAL)"
|
||||||
|
depends on EXPERIMENTAL && PCI
|
||||||
|
|
||||||
|
help
|
||||||
|
Say Y here if you want to be able to access MemoryStick cards with
|
||||||
|
the JMicron(R) JMB38X MemoryStick card reader.
|
||||||
|
|
||||||
|
To compile this driver as a module, choose M here: the
|
||||||
|
module will be called jmb38x_ms.
|
||||||
|
|||||||
@@ -3,8 +3,8 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
ifeq ($(CONFIG_MEMSTICK_DEBUG),y)
|
ifeq ($(CONFIG_MEMSTICK_DEBUG),y)
|
||||||
EXTRA_CFLAGS += -DDEBUG
|
EXTRA_CFLAGS += -DDEBUG
|
||||||
endif
|
endif
|
||||||
|
|
||||||
obj-$(CONFIG_MEMSTICK_TIFM_MS) += tifm_ms.o
|
obj-$(CONFIG_MEMSTICK_TIFM_MS) += tifm_ms.o
|
||||||
|
obj-$(CONFIG_MEMSTICK_JMICRON_38X) += jmb38x_ms.o
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -2184,6 +2184,7 @@
|
|||||||
#define PCI_DEVICE_ID_JMICRON_JMB366 0x2366
|
#define PCI_DEVICE_ID_JMICRON_JMB366 0x2366
|
||||||
#define PCI_DEVICE_ID_JMICRON_JMB368 0x2368
|
#define PCI_DEVICE_ID_JMICRON_JMB368 0x2368
|
||||||
#define PCI_DEVICE_ID_JMICRON_JMB38X_SD 0x2381
|
#define PCI_DEVICE_ID_JMICRON_JMB38X_SD 0x2381
|
||||||
|
#define PCI_DEVICE_ID_JMICRON_JMB38X_MS 0x2383
|
||||||
|
|
||||||
#define PCI_VENDOR_ID_KORENIX 0x1982
|
#define PCI_VENDOR_ID_KORENIX 0x1982
|
||||||
#define PCI_DEVICE_ID_KORENIX_JETCARDF0 0x1600
|
#define PCI_DEVICE_ID_KORENIX_JETCARDF0 0x1600
|
||||||
|
|||||||
Reference in New Issue
Block a user