linux/generic: refresh 2.6.36 kernel patches

[openwrt.git] / target / linux / generic / patches-2.6.36 / 922-gpiommc.patch

diff --git a/target/linux/generic/patches-2.6.36/922-gpiommc.patch b/target/linux/generic/patches-2.6.36/922-gpiommc.patch
index 379f4f9382948fb31944e6c064e3907df76881ed..887bb3ca458c933d6b8332c48ec06bc8efbf776a 100644 (file)
--- a/target/linux/generic/patches-2.6.36/922-gpiommc.patch
+++ b/target/linux/generic/patches-2.6.36/922-gpiommc.patch
@@ -611,7 +611,7 @@
 +module_exit(gpiommc_modexit);
 --- a/drivers/mmc/host/Kconfig
 +++ b/drivers/mmc/host/Kconfig
-@@ -382,6 +382,31 @@ config MMC_TMIO
+@@ -392,6 +392,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
-@@ -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
 +obj-$(CONFIG_GPIOMMC)         += gpiommc.o
  obj-$(CONFIG_SDH_BFIN)                += bfin_sdh.o
  obj-$(CONFIG_MMC_SH_MMCIF)    += sh_mmcif.o
- 
+ obj-$(CONFIG_MMC_JZ4740)      += jz4740_mmc.o
 --- /dev/null
 +++ b/include/linux/mmc/gpiommc.h
 @@ -0,0 +1,71 @@
@@ -829,7 +829,7 @@
 +be done automatically.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -2591,6 +2591,11 @@ T:      git git://git.kernel.org/pub/scm/linu
+@@ -2662,6 +2662,11 @@ T:      git git://git.kernel.org/pub/scm/linu
  S:    Maintained
  F:    drivers/media/video/gspca/
  
@@ -839,5 +839,5 @@
 +S:    Maintained
 +
  HARDWARE MONITORING
- L:    lm-sensors@lm-sensors.org
- W:    http://www.lm-sensors.org/
+ M:    Jean Delvare <khali@linux-fr.org>
+ M:    Guenter Roeck <guenter.roeck@ericsson.com>