aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-04-12 12:54:38 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-04-12 12:54:38 +0000
commit4bd65101ad1662499a04a8cba9a6057a4e514a36 (patch)
tree075bd47607491be1ba1cd5a116327e9644b1618b /target/linux/generic-2.6
parent3a35703faac125acb64b5e77a2ae01e3deaffc49 (diff)
downloadupstream-4bd65101ad1662499a04a8cba9a6057a4e514a36.tar.gz
upstream-4bd65101ad1662499a04a8cba9a6057a4e514a36.tar.bz2
upstream-4bd65101ad1662499a04a8cba9a6057a4e514a36.zip
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
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/922-gpiommc.patch2
1 files changed, 1 insertions, 1 deletions
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 99e12c6608..5d9e44d731 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