| 1 | From b784c5ab6423d0327d34d08e3532a16a4563e845 Mon Sep 17 00:00:00 2001 |
| 2 | From: Gabor Juhos <juhosg@openwrt.org> |
| 3 | Date: Fri, 18 Nov 2011 00:17:54 +0000 |
| 4 | Subject: [PATCH 23/27] MIPS: ath79: Rename ATH79_DEV_AR913X_WMAC option to ATH79_DEV_WMAC |
| 5 | |
| 6 | The ATH79_DEV_AR913X_WMAC option was used to select the AR913x specific |
| 7 | wireless MAC registration code. The registration code now supports the |
| 8 | AR933X SoCs as well. Rename the option to reflect the changes. |
| 9 | |
| 10 | Also make the new option depends on SOC_AR933X. |
| 11 | |
| 12 | Signed-off-by: Gabor Juhos <juhosg@openwrt.org> |
| 13 | Cc: Imre Kaloz <kaloz@openwrt.org> |
| 14 | Cc: linux-mips@linux-mips.org |
| 15 | Patchwork: https://patchwork.linux-mips.org/patch/3031/ |
| 16 | Signed-off-by: Ralf Baechle <ralf@linux-mips.org> |
| 17 | --- |
| 18 | arch/mips/ath79/Kconfig | 11 ++++++----- |
| 19 | arch/mips/ath79/Makefile | 2 +- |
| 20 | 2 files changed, 7 insertions(+), 6 deletions(-) |
| 21 | |
| 22 | --- a/arch/mips/ath79/Kconfig |
| 23 | +++ b/arch/mips/ath79/Kconfig |
| 24 | @@ -9,6 +9,7 @@ config ATH79_MACH_AP121 |
| 25 | select ATH79_DEV_LEDS_GPIO |
| 26 | select ATH79_DEV_SPI |
| 27 | select ATH79_DEV_USB |
| 28 | + select ATH79_DEV_WMAC |
| 29 | help |
| 30 | Say 'Y' here if you want your kernel to support the |
| 31 | Atheros AP121 reference board. |
| 32 | @@ -16,11 +17,11 @@ config ATH79_MACH_AP121 |
| 33 | config ATH79_MACH_AP81 |
| 34 | bool "Atheros AP81 reference board" |
| 35 | select SOC_AR913X |
| 36 | - select ATH79_DEV_AR913X_WMAC |
| 37 | select ATH79_DEV_GPIO_BUTTONS |
| 38 | select ATH79_DEV_LEDS_GPIO |
| 39 | select ATH79_DEV_SPI |
| 40 | select ATH79_DEV_USB |
| 41 | + select ATH79_DEV_WMAC |
| 42 | help |
| 43 | Say 'Y' here if you want your kernel to support the |
| 44 | Atheros AP81 reference board. |
| 45 | @@ -67,10 +68,6 @@ config SOC_AR933X |
| 46 | select USB_ARCH_HAS_EHCI |
| 47 | def_bool n |
| 48 | |
| 49 | -config ATH79_DEV_AR913X_WMAC |
| 50 | - depends on SOC_AR913X |
| 51 | - def_bool n |
| 52 | - |
| 53 | config ATH79_DEV_GPIO_BUTTONS |
| 54 | def_bool n |
| 55 | |
| 56 | @@ -83,4 +80,8 @@ config ATH79_DEV_SPI |
| 57 | config ATH79_DEV_USB |
| 58 | def_bool n |
| 59 | |
| 60 | +config ATH79_DEV_WMAC |
| 61 | + depends on (SOC_AR913X || SOC_AR933X) |
| 62 | + def_bool n |
| 63 | + |
| 64 | endif |
| 65 | --- a/arch/mips/ath79/Makefile |
| 66 | +++ b/arch/mips/ath79/Makefile |
| 67 | @@ -16,11 +16,11 @@ obj-$(CONFIG_EARLY_PRINTK) += early_pri |
| 68 | # Devices |
| 69 | # |
| 70 | obj-y += dev-common.o |
| 71 | -obj-$(CONFIG_ATH79_DEV_AR913X_WMAC) += dev-ar913x-wmac.o |
| 72 | obj-$(CONFIG_ATH79_DEV_GPIO_BUTTONS) += dev-gpio-buttons.o |
| 73 | obj-$(CONFIG_ATH79_DEV_LEDS_GPIO) += dev-leds-gpio.o |
| 74 | obj-$(CONFIG_ATH79_DEV_SPI) += dev-spi.o |
| 75 | obj-$(CONFIG_ATH79_DEV_USB) += dev-usb.o |
| 76 | +obj-$(CONFIG_ATH79_DEV_WMAC) += dev-ar913x-wmac.o |
| 77 | |
| 78 | # |
| 79 | # Machines |
| 80 | |
