aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorAlex Dubov <oakad@yahoo.com>2006-10-04 05:15:38 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 10:55:14 -0400
commitf9565129993446e16678cfc4d9c7f3b7e75eecbd (patch)
tree13b052ecee7b4713359b3333ed87fc9ada590727 /drivers/misc
parent4020f2d7f0b0e68b92bec9a3e1f4a54a7a9dc672 (diff)
[PATCH] mmc: driver for TI FlashMedia card reader - Kconfig/Makefile
Signed-off-by: Alex Dubov <oakad@yahoo.com> Cc: Daniel Qarras <dqarras@yahoo.com> Acked-by: Pierre Ossman <drzeus@drzeus.cx> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/Kconfig32
-rw-r--r--drivers/misc/Makefile2
2 files changed, 32 insertions, 2 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 7fc692a8f5b0..3df0e7a07c46 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -18,7 +18,7 @@ config IBM_ASM
18 service processor board as a regular serial port. To make use of 18 service processor board as a regular serial port. To make use of
19 this feature serial driver support (CONFIG_SERIAL_8250) must be 19 this feature serial driver support (CONFIG_SERIAL_8250) must be
20 enabled. 20 enabled.
21 21
22 WARNING: This software may not be supported or function 22 WARNING: This software may not be supported or function
23 correctly on your IBM server. Please consult the IBM ServerProven 23 correctly on your IBM server. Please consult the IBM ServerProven
24 website <http://www.pc.ibm.com/ww/eserver/xseries/serverproven> for 24 website <http://www.pc.ibm.com/ww/eserver/xseries/serverproven> for
@@ -28,5 +28,33 @@ config IBM_ASM
28 28
29 If unsure, say N. 29 If unsure, say N.
30 30
31endmenu 31config TIFM_CORE
32 tristate "TI Flash Media interface support (EXPERIMENTAL)"
33 depends on EXPERIMENTAL
34 help
35 If you want support for Texas Instruments(R) Flash Media adapters
36 you should select this option and then also choose an appropriate
37 host adapter, such as 'TI Flash Media PCI74xx/PCI76xx host adapter
38 support', if you have a TI PCI74xx compatible card reader, for
39 example.
40 You will also have to select some flash card format drivers. MMC/SD
41 cards are supported via 'MMC/SD Card support: TI Flash Media MMC/SD
42 Interface support (MMC_TIFM_SD)'.
43
44 To compile this driver as a module, choose M here: the module will
45 be called tifm_core.
32 46
47config TIFM_7XX1
48 tristate "TI Flash Media PCI74xx/PCI76xx host adapter support (EXPERIMENTAL)"
49 depends on PCI && TIFM_CORE && EXPERIMENTAL
50 default TIFM_CORE
51 help
52 This option enables support for Texas Instruments(R) PCI74xx and
53 PCI76xx families of Flash Media adapters, found in many laptops.
54 To make actual use of the device, you will have to select some
55 flash card format drivers, as outlined in the TIFM_CORE Help.
56
57 To compile this driver as a module, choose M here: the module will
58 be called tifm_7xx1.
59
60endmenu
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index c1bf1fb04c5c..d65ece76095a 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -6,3 +6,5 @@ obj- := misc.o # Dummy rule to force built-in.o to be made
6obj-$(CONFIG_IBM_ASM) += ibmasm/ 6obj-$(CONFIG_IBM_ASM) += ibmasm/
7obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/ 7obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/
8obj-$(CONFIG_LKDTM) += lkdtm.o 8obj-$(CONFIG_LKDTM) += lkdtm.o
9obj-$(CONFIG_TIFM_CORE) += tifm_core.o
10obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o