From 4bd65101ad1662499a04a8cba9a6057a4e514a36 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sun, 12 Apr 2009 12:54:38 +0000 Subject: [PATCH] do not override CONFIG_CONFIGFS_FS in a few places, and make gpiommc be selectable with the spio-gpio-old module (#4659) SVN-Revision: 15215 --- target/linux/brcm47xx/config-2.6.25 | 1 - target/linux/brcm47xx/config-2.6.28 | 1 - target/linux/brcm63xx/config-2.6.27 | 1 - target/linux/generic-2.6/patches-2.6.28/922-gpiommc.patch | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/target/linux/brcm47xx/config-2.6.25 b/target/linux/brcm47xx/config-2.6.25 index a6970f2cef58..fba45c46f197 100644 --- 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 0569ed880c56..79a6d725b16e 100644 --- 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 9f56d3e1af51..b99bd03f2d93 100644 --- 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 99e12c6608a8..5d9e44d7312c 100644 --- 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 -- 2.30.2