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
commit6f6bb8acd16a8a38b56151b7dfc5a814c8ae7bce (patch)
tree3cccaff691c5ea39d5d3d26fea5c7ac067aa722c /target/linux/ar71xx/config-2.6.37
parentf529b063945ec99e4d558eee41bdb018fcc95ec0 (diff)
downloadupstream-6f6bb8acd16a8a38b56151b7dfc5a814c8ae7bce.tar.gz
upstream-6f6bb8acd16a8a38b56151b7dfc5a814c8ae7bce.tar.bz2
upstream-6f6bb8acd16a8a38b56151b7dfc5a814c8ae7bce.zip
ar71xx: merge dev-ar9{13,34}x-wmac into dev-ar9xxx-wmac
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26595 3c298f89-4303-0410-b956-a3cf2f4a3e73
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