aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/atheros/patches-2.6.30
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-04-20 13:19:25 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-04-20 13:19:25 +0000
commitc05b2a2553d268d33871911c708e9710ffb4b83f (patch)
tree355507675b17aed4371afef555ee0a708f5ffa43 /target/linux/atheros/patches-2.6.30
parentf4ab2a76d1e1b38a716995d51c7096c9755fd0a7 (diff)
downloadupstream-c05b2a2553d268d33871911c708e9710ffb4b83f.tar.gz
upstream-c05b2a2553d268d33871911c708e9710ffb4b83f.tar.bz2
upstream-c05b2a2553d268d33871911c708e9710ffb4b83f.zip
atheros: register wmac device only if it is enabled in the board config
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21038 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-2.6.30')
-rw-r--r--target/linux/atheros/patches-2.6.30/100-board.patch8
1 files changed, 5 insertions, 3 deletions
diff --git a/target/linux/atheros/patches-2.6.30/100-board.patch b/target/linux/atheros/patches-2.6.30/100-board.patch
index 5f51293714..8183fb8aa2 100644
--- a/target/linux/atheros/patches-2.6.30/100-board.patch
+++ b/target/linux/atheros/patches-2.6.30/100-board.patch
@@ -1555,7 +1555,7 @@
+
--- /dev/null
+++ b/arch/mips/ar231x/ar5312.c
-@@ -0,0 +1,547 @@
+@@ -0,0 +1,549 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
@@ -1938,7 +1938,8 @@
+ if (!ar231x_board.radio)
+ return 0;
+
-+ if (*((u32 *) radio) & AR531X_RADIO0_MASK)
++ if ((*((u32 *) radio) & AR531X_RADIO0_MASK) &&
++ (config->flags & BD_WLAN0))
+ ar231x_add_wmac(0, AR531X_WLAN0,
+ AR5312_IRQ_WLAN0_INTRS);
+
@@ -1962,7 +1963,8 @@
+ break;
+ }
+
-+ if (*((u32 *) radio) & AR531X_RADIO1_MASK)
++ if ((*((u32 *) radio) & AR531X_RADIO1_MASK) &&
++ (config->flags & BD_WLAN1))
+ ar231x_add_wmac(1, AR531X_WLAN1,
+ AR5312_IRQ_WLAN1_INTRS);
+