diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-04-18 18:35:47 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-04-18 18:35:47 +0000 |
| commit | 78981f6f3c3fa003b7c9c351a1c902027fa1d1cd (patch) | |
| tree | 3d48afe764021b9292fe61bfc90efc9e44d67298 /target/linux/generic-2.6/patches-2.6.34/922-gpiommc.patch | |
| parent | 8c0ee9484b18f1db5fb901829706626bf5fc5a26 (diff) | |
| download | upstream-78981f6f3c3fa003b7c9c351a1c902027fa1d1cd.tar.gz upstream-78981f6f3c3fa003b7c9c351a1c902027fa1d1cd.tar.bz2 upstream-78981f6f3c3fa003b7c9c351a1c902027fa1d1cd.zip | |
kernel: refresh patches with 2.6.34-rc4
SVN-Revision: 20999
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.34/922-gpiommc.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.34/922-gpiommc.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.34/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.34/922-gpiommc.patch index cb39a705f2..24e5d592e8 100644 --- a/target/linux/generic-2.6/patches-2.6.34/922-gpiommc.patch +++ b/target/linux/generic-2.6/patches-2.6.34/922-gpiommc.patch @@ -611,7 +611,7 @@ +module_exit(gpiommc_modexit); --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig -@@ -373,6 +373,31 @@ config MMC_TMIO +@@ -370,6 +370,31 @@ config MMC_TMIO This provides support for the SD/MMC cell found in TC6393XB, T7L66XB and also HTC ASIC3 @@ -645,7 +645,7 @@ depends on PCI --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile -@@ -34,6 +34,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_ +@@ -33,6 +33,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 @@ -829,7 +829,7 @@ +be done automatically. --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2443,6 +2443,11 @@ T: git git://git.kernel.org/pub/scm/linu +@@ -2540,6 +2540,11 @@ T: git git://git.kernel.org/pub/scm/linu S: Maintained F: drivers/media/video/gspca/ |