diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-04-20 13:19:25 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-04-20 13:19:25 +0000 |
| commit | f1eeb9b19909084a58483ed10530011043305a2e (patch) | |
| tree | d3644d9b922019e4ff133c9e13306a900646f2cc /target/linux/atheros/patches-2.6.30 | |
| parent | d7919c8d0dbd5aa4a177ed47c791df33d0d98099 (diff) | |
| download | upstream-f1eeb9b19909084a58483ed10530011043305a2e.tar.gz upstream-f1eeb9b19909084a58483ed10530011043305a2e.tar.bz2 upstream-f1eeb9b19909084a58483ed10530011043305a2e.zip | |
atheros: register wmac device only if it is enabled in the board config
SVN-Revision: 21038
Diffstat (limited to 'target/linux/atheros/patches-2.6.30')
| -rw-r--r-- | target/linux/atheros/patches-2.6.30/100-board.patch | 8 |
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); + |