aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/config-2.6.37
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2011-04-11 17:37:08 +0000
committerGabor Juhos <juhosg@openwrt.org>2011-04-11 17:37:08 +0000
commitef4c1d49a6d8d823291be63ba314ff33d06a02fc (patch)
treee6de15c890132879eb0933a9d4df4822f3e93a3b /target/linux/ar71xx/config-2.6.37
parent4711dea8ff2cdaabc7fa32cb88b8e06531e98e19 (diff)
downloadupstream-ef4c1d49a6d8d823291be63ba314ff33d06a02fc.tar.gz
upstream-ef4c1d49a6d8d823291be63ba314ff33d06a02fc.tar.bz2
upstream-ef4c1d49a6d8d823291be63ba314ff33d06a02fc.zip
ar71xx: merge dev-ar9{13,34}x-wmac into dev-ar9xxx-wmac
SVN-Revision: 26595
Diffstat (limited to 'target/linux/ar71xx/config-2.6.37')
-rw-r--r--target/linux/ar71xx/config-2.6.373
1 files changed, 1 insertions, 2 deletions
diff --git a/target/linux/ar71xx/config-2.6.37 b/target/linux/ar71xx/config-2.6.37
index c39308e4a9..bbf76d564a 100644
--- a/target/linux/ar71xx/config-2.6.37
+++ b/target/linux/ar71xx/config-2.6.37
@@ -4,8 +4,7 @@ CONFIG_AG71XX_AR8216_SUPPORT=y
# CONFIG_AG71XX_DEBUG_FS is not set
CONFIG_AR71XX_DEV_AP91_PCI=y
CONFIG_AR71XX_DEV_AP94_PCI=y
-CONFIG_AR71XX_DEV_AR913X_WMAC=y
-CONFIG_AR71XX_DEV_AR934X_WMAC=y
+CONFIG_AR71XX_DEV_AR9XXX_WMAC=y
CONFIG_AR71XX_DEV_DB120_PCI=y
CONFIG_AR71XX_DEV_DSA=y
CONFIG_AR71XX_DEV_GPIO_BUTTONS=y