The patch titled
mmc: driver for TI FlashMedia card reader - Kconfig/Makefile
has been removed from the -mm tree. Its filename is
mmc-driver-for-ti-flashmedia-card-reader-kconfig-makefile.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: mmc: driver for TI FlashMedia card reader - Kconfig/Makefile
From: Alex Dubov <oakad@xxxxxxxxx>
Signed-off-by: Alex Dubov <oakad@xxxxxxxxx>
Cc: Daniel Qarras <dqarras@xxxxxxxxx>
Acked-by: Pierre Ossman <drzeus@xxxxxxxxx>
Cc: Russell King <rmk@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/misc/Kconfig | 32 ++++++++++++++++++++++++++++++--
drivers/misc/Makefile | 2 ++
drivers/mmc/Kconfig | 16 ++++++++++++++++
drivers/mmc/Makefile | 1 +
4 files changed, 49 insertions(+), 2 deletions(-)
diff -puN drivers/misc/Kconfig~mmc-driver-for-ti-flashmedia-card-reader-kconfig-makefile drivers/misc/Kconfig
--- a/drivers/misc/Kconfig~mmc-driver-for-ti-flashmedia-card-reader-kconfig-makefile
+++ a/drivers/misc/Kconfig
@@ -18,7 +18,7 @@ config IBM_ASM
service processor board as a regular serial port. To make use of
this feature serial driver support (CONFIG_SERIAL_8250) must be
enabled.
-
+
WARNING: This software may not be supported or function
correctly on your IBM server. Please consult the IBM ServerProven
website <http://www.pc.ibm.com/ww/eserver/xseries/serverproven> for
@@ -28,5 +28,33 @@ config IBM_ASM
If unsure, say N.
-endmenu
+config TIFM_CORE
+ tristate "TI Flash Media interface support (EXPERIMENTAL)"
+ depends on EXPERIMENTAL
+ help
+ If you want support for Texas Instruments(R) Flash Media adapters
+ you should select this option and then also choose an appropriate
+ host adapter, such as 'TI Flash Media PCI74xx/PCI76xx host adapter
+ support', if you have a TI PCI74xx compatible card reader, for
+ example.
+ You will also have to select some flash card format drivers. MMC/SD
+ cards are supported via 'MMC/SD Card support: TI Flash Media MMC/SD
+ Interface support (MMC_TIFM_SD)'.
+
+ To compile this driver as a module, choose M here: the module will
+ be called tifm_core.
+config TIFM_7XX1
+ tristate "TI Flash Media PCI74xx/PCI76xx host adapter support (EXPERIMENTAL)"
+ depends on PCI && TIFM_CORE && EXPERIMENTAL
+ default TIFM_CORE
+ help
+ This option enables support for Texas Instruments(R) PCI74xx and
+ PCI76xx families of Flash Media adapters, found in many laptops.
+ To make actual use of the device, you will have to select some
+ flash card format drivers, as outlined in the TIFM_CORE Help.
+
+ To compile this driver as a module, choose M here: the module will
+ be called tifm_7xx1.
+
+endmenu
diff -puN drivers/misc/Makefile~mmc-driver-for-ti-flashmedia-card-reader-kconfig-makefile drivers/misc/Makefile
--- a/drivers/misc/Makefile~mmc-driver-for-ti-flashmedia-card-reader-kconfig-makefile
+++ a/drivers/misc/Makefile
@@ -6,3 +6,5 @@ obj- := misc.o # Dummy rule to force bui
obj-$(CONFIG_IBM_ASM) += ibmasm/
obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/
obj-$(CONFIG_LKDTM) += lkdtm.o
+obj-$(CONFIG_TIFM_CORE) += tifm_core.o
+obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o
diff -puN drivers/mmc/Kconfig~mmc-driver-for-ti-flashmedia-card-reader-kconfig-makefile drivers/mmc/Kconfig
--- a/drivers/mmc/Kconfig~mmc-driver-for-ti-flashmedia-card-reader-kconfig-makefile
+++ a/drivers/mmc/Kconfig
@@ -109,4 +109,20 @@ config MMC_IMX
If unsure, say N.
+config MMC_TIFM_SD
+ tristate "TI Flash Media MMC/SD Interface support (EXPERIMENTAL)"
+ depends on MMC && EXPERIMENTAL
+ select TIFM_CORE
+ help
+ Say Y here if you want to be able to access MMC/SD cards with
+ the Texas Instruments(R) Flash Media card reader, found in many
+ laptops.
+ This option 'selects' (turns on, enables) 'TIFM_CORE', but you
+ probably also need appropriate card reader host adapter, such as
+ 'Misc devices: TI Flash Media PCI74xx/PCI76xx host adapter support
+ (TIFM_7XX1)'.
+
+ To compile this driver as a module, choose M here: the
+ module will be called tifm_sd.
+
endmenu
diff -puN drivers/mmc/Makefile~mmc-driver-for-ti-flashmedia-card-reader-kconfig-makefile drivers/mmc/Makefile
--- a/drivers/mmc/Makefile~mmc-driver-for-ti-flashmedia-card-reader-kconfig-makefile
+++ a/drivers/mmc/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_MMC_WBSD) += wbsd.o
obj-$(CONFIG_MMC_AU1X) += au1xmmc.o
obj-$(CONFIG_MMC_OMAP) += omap.o
obj-$(CONFIG_MMC_AT91RM9200) += at91_mci.o
+obj-$(CONFIG_MMC_TIFM_SD) += tifm_sd.o
mmc_core-y := mmc.o mmc_sysfs.o
mmc_core-$(CONFIG_BLOCK) += mmc_queue.o
_
Patches currently in -mm which might be from oakad@xxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
