linux-mips
[Top] [All Lists]

[PATCH 5/6] MIPS: ath79: rename ATH79_DEV_AR913X_WMAC option to ATH79_DE

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH 5/6] MIPS: ath79: rename ATH79_DEV_AR913X_WMAC option to ATH79_DEV_WMAC
From: Gabor Juhos <juhosg@openwrt.org>
Date: Thu, 17 Nov 2011 23:13:46 +0100
Cc: Imre Kaloz <kaloz@openwrt.org>, linux-mips@linux-mips.org, Gabor Juhos <juhosg@openwrt.org>
In-reply-to: <1321568027-32066-1-git-send-email-juhosg@openwrt.org>
References: <1321568027-32066-1-git-send-email-juhosg@openwrt.org>
Sender: linux-mips-bounce@linux-mips.org
The ATH79_DEV_AR913X_WMAC option was used to select
the AR913x specific wireless MAC registration code.
The registration code now supports the AR933X SoCs
as well. Rename the option to reflect the changes.

Also make the new option depends on SOC_AR933X.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
 arch/mips/ath79/Kconfig  |   11 ++++++-----
 arch/mips/ath79/Makefile |    2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index 4a7e0e8..4fc697d 100644
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -9,6 +9,7 @@ config ATH79_MACH_AP121
        select ATH79_DEV_LEDS_GPIO
        select ATH79_DEV_SPI
        select ATH79_DEV_USB
+       select ATH79_DEV_WMAC
        help
          Say 'Y' here if you want your kernel to support the
          Atheros AP121 reference board.
@@ -16,11 +17,11 @@ config ATH79_MACH_AP121
 config ATH79_MACH_AP81
        bool "Atheros AP81 reference board"
        select SOC_AR913X
-       select ATH79_DEV_AR913X_WMAC
        select ATH79_DEV_GPIO_BUTTONS
        select ATH79_DEV_LEDS_GPIO
        select ATH79_DEV_SPI
        select ATH79_DEV_USB
+       select ATH79_DEV_WMAC
        help
          Say 'Y' here if you want your kernel to support the
          Atheros AP81 reference board.
@@ -56,10 +57,6 @@ config SOC_AR933X
        select USB_ARCH_HAS_EHCI
        def_bool n
 
-config ATH79_DEV_AR913X_WMAC
-       depends on SOC_AR913X
-       def_bool n
-
 config ATH79_DEV_GPIO_BUTTONS
        def_bool n
 
@@ -72,4 +69,8 @@ config ATH79_DEV_SPI
 config ATH79_DEV_USB
        def_bool n
 
+config ATH79_DEV_WMAC
+       depends on (SOC_AR913X || SOC_AR933X)
+       def_bool n
+
 endif
diff --git a/arch/mips/ath79/Makefile b/arch/mips/ath79/Makefile
index 8933d18..ac159e6 100644
--- a/arch/mips/ath79/Makefile
+++ b/arch/mips/ath79/Makefile
@@ -16,11 +16,11 @@ obj-$(CONFIG_EARLY_PRINTK)          += early_printk.o
 # Devices
 #
 obj-y                                  += dev-common.o
-obj-$(CONFIG_ATH79_DEV_AR913X_WMAC)    += dev-ar913x-wmac.o
 obj-$(CONFIG_ATH79_DEV_GPIO_BUTTONS)   += dev-gpio-buttons.o
 obj-$(CONFIG_ATH79_DEV_LEDS_GPIO)      += dev-leds-gpio.o
 obj-$(CONFIG_ATH79_DEV_SPI)            += dev-spi.o
 obj-$(CONFIG_ATH79_DEV_USB)            += dev-usb.o
+obj-$(CONFIG_ATH79_DEV_WMAC)           += dev-ar913x-wmac.o
 
 #
 # Machines
-- 
1.7.2.1


<Prev in Thread] Current Thread [Next in Thread>