diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-01-10 14:05:18 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-01-10 14:05:18 +0000 |
commit | 885eea184225e2d190f7aa8742ac806034caa9fc (patch) | |
tree | d60d951609d8e3a315c92b06a0670dc814525594 /target/linux/brcm47xx/config-3.6 | |
parent | a2950fabd4c84c867bf303e2e92bf99c2eb8b87a (diff) | |
download | upstream-885eea184225e2d190f7aa8742ac806034caa9fc.tar.gz upstream-885eea184225e2d190f7aa8742ac806034caa9fc.tar.bz2 upstream-885eea184225e2d190f7aa8742ac806034caa9fc.zip |
kernel: update bcma and ssb to master-2013-01-09 from wireless-testing
SVN-Revision: 35080
Diffstat (limited to 'target/linux/brcm47xx/config-3.6')
-rw-r--r-- | target/linux/brcm47xx/config-3.6 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/target/linux/brcm47xx/config-3.6 b/target/linux/brcm47xx/config-3.6 index ae56ccf4dc..7f1ea7d724 100644 --- a/target/linux/brcm47xx/config-3.6 +++ b/target/linux/brcm47xx/config-3.6 @@ -3,9 +3,9 @@ CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y # CONFIG_ARPD is not set CONFIG_BCM47XX=y CONFIG_BCM47XX_BCMA=y @@ -15,6 +15,7 @@ CONFIG_BCMA=y CONFIG_BCMA_BLOCKIO=y CONFIG_BCMA_DEBUG=y CONFIG_BCMA_DRIVER_GMAC_CMN=y +CONFIG_BCMA_DRIVER_GPIO=y CONFIG_BCMA_DRIVER_MIPS=y CONFIG_BCMA_DRIVER_PCI_HOSTMODE=y CONFIG_BCMA_HOST_PCI=y @@ -120,6 +121,7 @@ CONFIG_SSB_BLOCKIO=y CONFIG_SSB_DEBUG=y CONFIG_SSB_DRIVER_EXTIF=y CONFIG_SSB_DRIVER_GIGE=y +CONFIG_SSB_DRIVER_GPIO=y CONFIG_SSB_DRIVER_MIPS=y CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y |