kernel: update from version 2.6.32.25 to 2.6.32.27

[openwrt-10.03/.git] / target / linux / generic-2.6 / patches-2.6.32 / 922-gpiommc.patch

diff --git a/target/linux/generic-2.6/patches-2.6.32/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.32/922-gpiommc.patch
index e2547eda8fd204c87bbf08426d51e868f23a9689..aef06810ab36f01e1a32109f478e8f887ae303ee 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.32/922-gpiommc.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/922-gpiommc.patch
@@ -617,7 +617,7 @@
  
 +config GPIOMMC
 +      tristate "MMC/SD over GPIO-based SPI"
-+      depends on MMC && MMC_SPI && SPI_GPIO
++      depends on MMC && MMC_SPI && SPI_GPIO_OLD
 +      help
 +        This driver hooks up the mmc_spi and spi_gpio modules so that
 +        MMC/SD cards can be used on a GPIO based bus by bitbanging
@@ -829,7 +829,7 @@
 +be done automatically.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -2348,6 +2348,11 @@ T:      git git://git.kernel.org/pub/scm/linu
+@@ -2383,6 +2383,11 @@ T:      git git://git.kernel.org/pub/scm/linu
  S:    Maintained
  F:    drivers/media/video/gspca/