[kernel] do not override CONFIG_CONFIGFS_FS in a few places, and make gpiommc be...
authorFlorian Fainelli <florian@openwrt.org>
Sun, 12 Apr 2009 12:54:38 +0000 (12:54 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Sun, 12 Apr 2009 12:54:38 +0000 (12:54 +0000)
SVN-Revision: 15215

target/linux/brcm47xx/config-2.6.25
target/linux/brcm47xx/config-2.6.28
target/linux/brcm63xx/config-2.6.27
target/linux/generic-2.6/patches-2.6.28/922-gpiommc.patch

index a6970f2..fba45c4 100644 (file)
@@ -21,7 +21,6 @@ CONFIG_CEVT_R4K=y
 CONFIG_CFE=y
 CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd console=ttyS0,115200"
-# CONFIG_CONFIGFS_FS is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_PREFETCH=y
index 0569ed8..79a6d72 100644 (file)
@@ -21,7 +21,6 @@ CONFIG_CEVT_R4K=y
 CONFIG_CFE=y
 CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd console=ttyS0,115200"
-# CONFIG_CONFIGFS_FS is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_PREFETCH=y
index 9f56d3e..b99bd03 100644 (file)
@@ -28,7 +28,6 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_CEVT_R4K=y
 CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd console=ttyS0,115200"
-# CONFIG_CONFIGFS_FS is not set
 CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_PREFETCH=y
index 99e12c6..5d9e44d 100644 (file)
 +
 +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