aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.35/922-gpiommc.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-07-17 14:10:39 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-07-17 14:10:39 +0000
commitc5ef57706de0ef3e4ede1b404ef43510bb22e6d9 (patch)
tree2a14f0b332c80242d488f0de7b0c351b00ee9dea /target/linux/generic/patches-2.6.35/922-gpiommc.patch
parent1d7a6ebc79e71dbc9085efab8205134bc769159b (diff)
downloadupstream-c5ef57706de0ef3e4ede1b404ef43510bb22e6d9.tar.gz
upstream-c5ef57706de0ef3e4ede1b404ef43510bb22e6d9.tar.bz2
upstream-c5ef57706de0ef3e4ede1b404ef43510bb22e6d9.zip
kernel: refresh patches
SVN-Revision: 22252
Diffstat (limited to 'target/linux/generic/patches-2.6.35/922-gpiommc.patch')
-rw-r--r--target/linux/generic/patches-2.6.35/922-gpiommc.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.35/922-gpiommc.patch b/target/linux/generic/patches-2.6.35/922-gpiommc.patch
index 24e5d592e8..379f4f9382 100644
--- a/target/linux/generic/patches-2.6.35/922-gpiommc.patch
+++ b/target/linux/generic/patches-2.6.35/922-gpiommc.patch
@@ -611,7 +611,7 @@
+module_exit(gpiommc_modexit);
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
-@@ -370,6 +370,31 @@ config MMC_TMIO
+@@ -382,6 +382,31 @@ config MMC_TMIO
This provides support for the SD/MMC cell found in TC6393XB,
T7L66XB and also HTC ASIC3
@@ -645,14 +645,14 @@
depends on PCI
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
-@@ -33,6 +33,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_
+@@ -34,6 +34,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_
obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o
obj-$(CONFIG_MMC_CB710) += cb710-mmc.o
obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o
+obj-$(CONFIG_GPIOMMC) += gpiommc.o
obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o
+ obj-$(CONFIG_MMC_SH_MMCIF) += sh_mmcif.o
- obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o
--- /dev/null
+++ b/include/linux/mmc/gpiommc.h
@@ -0,0 +1,71 @@
@@ -829,7 +829,7 @@
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -2540,6 +2540,11 @@ T: git git://git.kernel.org/pub/scm/linu
+@@ -2591,6 +2591,11 @@ T: git git://git.kernel.org/pub/scm/linu
S: Maintained
F: drivers/media/video/gspca/