diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2010-07-17 14:10:39 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2010-07-17 14:10:39 +0000 |
| commit | 5272f096fb0541852734245658d3247cc1395d2f (patch) | |
| tree | 8d1c382840f7148dc13b1f9ca30e753adb61a929 /target/linux/generic/patches-2.6.35/922-gpiommc.patch | |
| parent | 3770e0e7facafd3c2f9d0a73b5e1b93c97affc97 (diff) | |
| download | upstream-5272f096fb0541852734245658d3247cc1395d2f.tar.gz upstream-5272f096fb0541852734245658d3247cc1395d2f.tar.bz2 upstream-5272f096fb0541852734245658d3247cc1395d2f.zip | |
kernel: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22252 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 8 |
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/ |