merge missing updates to squashfs lzma support from 2.6.30 to 2.6.31

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

diff --git a/target/linux/generic-2.6/patches-2.6.28/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.28/922-gpiommc.patch
index 5367de8..5d9e44d 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.28/922-gpiommc.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/922-gpiommc.patch
@@ -15,7 +15,7 @@
 +#include <linux/platform_device.h>
 +#include <linux/list.h>
 +#include <linux/mutex.h>
-+#include <linux/spi/spi_gpio.h>
++#include <linux/spi/spi_gpio_old.h>
 +#include <linux/configfs.h>
 +#include <linux/gpio.h>
 +#include <asm/atomic.h>
@@ -618,7 +618,7 @@
 +
 +config GPIOMMC
 +      tristate "MMC/SD over GPIO-based SPI"
-+      depends on MMC && MMC_SPI && SPI_GPIO
++      depends on MMC && MMC_SPI && (SPI_GPIO || 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