atheros: register wmac device only if it is enabled in the board config

SVN-Revision: 21038
This commit is contained in:
Gabor Juhos 2010-04-20 13:19:25 +00:00
parent d7919c8d0d
commit f1eeb9b199
3 changed files with 15 additions and 9 deletions

View file

@ -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);
+

View file

@ -1557,7 +1557,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
@ -1940,7 +1940,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);
+
@ -1964,7 +1965,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);
+

View file

@ -1557,7 +1557,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
@ -1940,7 +1940,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);
+
@ -1964,7 +1965,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);
+