[kernel] do not override CONFIG_CONFIGFS_FS in a few places, and make gpiommc be...

SVN-Revision: 15215

diff --git a/target/linux/brcm47xx/config-2.6.25 b/target/linux/brcm47xx/config-2.6.25
index a6970f2cef589697688f10f738c35b1ade82f664..fba45c46f1975fd725f4a69781ff5ac1bad5b13a 100644 (file)
--- a/target/linux/brcm47xx/config-2.6.25
+++ b/target/linux/brcm47xx/config-2.6.25
@@ -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

diff --git a/target/linux/brcm47xx/config-2.6.28 b/target/linux/brcm47xx/config-2.6.28
index 0569ed880c569d116c82d44d88f9fa7d31daa156..79a6d725b16ea5cc3757aa4ab0d3a884d476e6de 100644 (file)
--- a/target/linux/brcm47xx/config-2.6.28
+++ b/target/linux/brcm47xx/config-2.6.28
@@ -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

diff --git a/target/linux/brcm63xx/config-2.6.27 b/target/linux/brcm63xx/config-2.6.27
index 9f56d3e1af511896b3976db2cdc01df03dd45af9..b99bd03f2d93c4b42de470402b3a40fb9a18b901 100644 (file)
--- a/target/linux/brcm63xx/config-2.6.27
+++ b/target/linux/brcm63xx/config-2.6.27
@@ -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

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 99e12c6608a83d396c4a38624110f6370024ada9..5d9e44d7312c8a282aefe37338dd1bbd0beeedad 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
@@ -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