25 files changed, 5 insertions, 5 deletions
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index e487fe7144..6623c5ad39 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -534,7 +534,7 @@ endef
 define KernelPackage/ath
   $(call KernelPackage/mac80211/Default)
   TITLE:=Atheros common driver part
-  DEPENDS+= @PCI_SUPPORT||USB_SUPPORT||TARGET_ar71xx||TARGET_atheros +kmod-mac80211
+  DEPENDS+= @PCI_SUPPORT||USB_SUPPORT||TARGET_ar71xx||TARGET_ath25 +kmod-mac80211
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath.ko
   MENU:=1
 endef
@@ -547,7 +547,7 @@ define KernelPackage/ath5k
   $(call KernelPackage/mac80211/Default)
   TITLE:=Atheros 5xxx wireless cards support
   URL:=http://linuxwireless.org/en/users/Drivers/ath5k
-  DEPENDS+= @PCI_SUPPORT||@TARGET_atheros +kmod-ath
+  DEPENDS+= @PCI_SUPPORT||@TARGET_ath25 +kmod-ath
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath5k/ath5k.ko
   AUTOLOAD:=$(call AutoProbe,ath5k)
 endef
@@ -1556,7 +1556,7 @@ config-$(call config_package,ath9k-htc) += ATH9K_HTC
 config-$(call config_package,ath10k) += ATH10K ATH10K_PCI
 
 config-$(call config_package,ath5k) += ATH5K
-ifdef CONFIG_TARGET_atheros
+ifdef CONFIG_TARGET_ath25
   config-y += ATH5K_AHB
 else
   config-y += ATH5K_PCI
diff --git a/package/kernel/wrt55agv2-spidevs/Makefile b/package/kernel/wrt55agv2-spidevs/Makefile
index bfd24c2f8d..a63180b8f9 100644
--- a/package/kernel/wrt55agv2-spidevs/Makefile
+++ b/package/kernel/wrt55agv2-spidevs/Makefile
@@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk
 define KernelPackage/wrt55agv2-spidevs
   SUBMENU:=Other modules
   TITLE:=WRT55AG v2 SPI devices support
-  DEPENDS:=@TARGET_atheros +kmod-spi-gpio-old +kmod-spi-ks8995
+  DEPENDS:=@TARGET_ath25 +kmod-spi-gpio-old +kmod-spi-ks8995
   FILES:=$(PKG_BUILD_DIR)/wrt55agv2_spidevs.ko
 endef
 
diff --git a/target/linux/atheros/Makefile b/target/linux/ath25/Makefile
index 170d4afd3b..b1baa2e6b0 100644
--- a/target/linux/atheros/Makefile
+++ b/target/linux/ath25/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 ARCH:=mips
-BOARD:=atheros
+BOARD:=ath25
 BOARDNAME:=Atheros AR231x/AR5312
 FEATURES:=squashfs low_mem
 
diff --git a/target/linux/atheros/base-files/etc/config/system b/target/linux/ath25/base-files/etc/config/system
index 1d29ad8c39..1d29ad8c39 100644
--- a/target/linux/atheros/base-files/etc/config/system
+++ b/target/linux/ath25/base-files/etc/config/system
diff --git a/target/linux/atheros/base-files/etc/hotplug.d/button/00-button b/target/linux/ath25/base-files/etc/hotplug.d/button/00-button
index 63cc217d5d..63cc217d5d 100644
--- a/target/linux/atheros/base-files/etc/hotplug.d/button/00-button
+++ b/target/linux/ath25/base-files/etc/hotplug.d/button/00-button
diff --git a/target/linux/atheros/base-files/etc/uci-defaults/01_leds b/target/linux/ath25/base-files/etc/uci-defaults/01_leds
index 076a04bfdf..076a04bfdf 100644
--- a/target/linux/atheros/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/ath25/base-files/etc/uci-defaults/01_leds
diff --git a/target/linux/atheros/base-files/etc/uci-defaults/02_network b/target/linux/ath25/base-files/etc/uci-defaults/02_network
index 7e91e6ac2c..7e91e6ac2c 100644
--- a/target/linux/atheros/base-files/etc/uci-defaults/02_network
+++ b/target/linux/ath25/base-files/etc/uci-defaults/02_network
diff --git a/target/linux/atheros/base-files/lib/preinit/15_preinit_iface_atheros b/target/linux/ath25/base-files/lib/preinit/15_preinit_iface_atheros
index 434103e172..434103e172 100644
--- a/target/linux/atheros/base-files/lib/preinit/15_preinit_iface_atheros
+++ b/target/linux/ath25/base-files/lib/preinit/15_preinit_iface_atheros
diff --git a/target/linux/atheros/base-files/lib/upgrade/platform.sh b/target/linux/ath25/base-files/lib/upgrade/platform.sh
index d44b8fad80..d44b8fad80 100644
--- a/target/linux/atheros/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ath25/base-files/lib/upgrade/platform.sh
diff --git a/target/linux/atheros/config-3.18 b/target/linux/ath25/config-3.18
index a275a6f703..a275a6f703 100644
--- a/target/linux/atheros/config-3.18
+++ b/target/linux/ath25/config-3.18
diff --git a/target/linux/atheros/image/Makefile b/target/linux/ath25/image/Makefile
index 86f2d44bfe..86f2d44bfe 100644
--- a/target/linux/atheros/image/Makefile
+++ b/target/linux/ath25/image/Makefile
diff --git a/target/linux/atheros/patches-3.18/010-board.patch b/target/linux/ath25/patches-3.18/010-board.patch
index 03332b6e30..03332b6e30 100644
--- a/target/linux/atheros/patches-3.18/010-board.patch
+++ b/target/linux/ath25/patches-3.18/010-board.patch
diff --git a/target/linux/atheros/patches-3.18/020-early-printk-support.patch b/target/linux/ath25/patches-3.18/020-early-printk-support.patch
index bd937d34a6..bd937d34a6 100644
--- a/target/linux/atheros/patches-3.18/020-early-printk-support.patch
+++ b/target/linux/ath25/patches-3.18/020-early-printk-support.patch
diff --git a/target/linux/atheros/patches-3.18/030-ar2315_pci.patch b/target/linux/ath25/patches-3.18/030-ar2315_pci.patch
index 08b74636dd..08b74636dd 100644
--- a/target/linux/atheros/patches-3.18/030-ar2315_pci.patch
+++ b/target/linux/ath25/patches-3.18/030-ar2315_pci.patch
diff --git a/target/linux/atheros/patches-3.18/107-ar5312_gpio.patch b/target/linux/ath25/patches-3.18/107-ar5312_gpio.patch
index a6d0a88355..a6d0a88355 100644
--- a/target/linux/atheros/patches-3.18/107-ar5312_gpio.patch
+++ b/target/linux/ath25/patches-3.18/107-ar5312_gpio.patch
diff --git a/target/linux/atheros/patches-3.18/108-ar2315_gpio.patch b/target/linux/ath25/patches-3.18/108-ar2315_gpio.patch
index 5d9785346d..5d9785346d 100644
--- a/target/linux/atheros/patches-3.18/108-ar2315_gpio.patch
+++ b/target/linux/ath25/patches-3.18/108-ar2315_gpio.patch
diff --git a/target/linux/atheros/patches-3.18/110-ar2313_ethernet.patch b/target/linux/ath25/patches-3.18/110-ar2313_ethernet.patch
index bef70dd7c5..bef70dd7c5 100644
--- a/target/linux/atheros/patches-3.18/110-ar2313_ethernet.patch
+++ b/target/linux/ath25/patches-3.18/110-ar2313_ethernet.patch
diff --git a/target/linux/atheros/patches-3.18/120-spiflash.patch b/target/linux/ath25/patches-3.18/120-spiflash.patch
index 7d88ee2170..7d88ee2170 100644
--- a/target/linux/atheros/patches-3.18/120-spiflash.patch
+++ b/target/linux/ath25/patches-3.18/120-spiflash.patch
diff --git a/target/linux/atheros/patches-3.18/130-watchdog.patch b/target/linux/ath25/patches-3.18/130-watchdog.patch
index 255064a8f2..255064a8f2 100644
--- a/target/linux/atheros/patches-3.18/130-watchdog.patch
+++ b/target/linux/ath25/patches-3.18/130-watchdog.patch
diff --git a/target/linux/atheros/patches-3.18/140-redboot_boardconfig.patch b/target/linux/ath25/patches-3.18/140-redboot_boardconfig.patch
index 98dbf52611..98dbf52611 100644
--- a/target/linux/atheros/patches-3.18/140-redboot_boardconfig.patch
+++ b/target/linux/ath25/patches-3.18/140-redboot_boardconfig.patch
diff --git a/target/linux/atheros/patches-3.18/141-redboot_partition_scan.patch b/target/linux/ath25/patches-3.18/141-redboot_partition_scan.patch
index d1d281eaf4..d1d281eaf4 100644
--- a/target/linux/atheros/patches-3.18/141-redboot_partition_scan.patch
+++ b/target/linux/ath25/patches-3.18/141-redboot_partition_scan.patch
diff --git a/target/linux/atheros/patches-3.18/142-redboot_various_erase_size_fix.patch b/target/linux/ath25/patches-3.18/142-redboot_various_erase_size_fix.patch
index e1b0a89905..e1b0a89905 100644
--- a/target/linux/atheros/patches-3.18/142-redboot_various_erase_size_fix.patch
+++ b/target/linux/ath25/patches-3.18/142-redboot_various_erase_size_fix.patch
diff --git a/target/linux/atheros/patches-3.18/210-reset_button.patch b/target/linux/ath25/patches-3.18/210-reset_button.patch
index 34ef46bc52..34ef46bc52 100644
--- a/target/linux/atheros/patches-3.18/210-reset_button.patch
+++ b/target/linux/ath25/patches-3.18/210-reset_button.patch
diff --git a/target/linux/atheros/patches-3.18/220-enet_micrel_workaround.patch b/target/linux/ath25/patches-3.18/220-enet_micrel_workaround.patch
index 398495a80c..398495a80c 100644
--- a/target/linux/atheros/patches-3.18/220-enet_micrel_workaround.patch
+++ b/target/linux/ath25/patches-3.18/220-enet_micrel_workaround.patch
diff --git a/target/linux/atheros/patches-3.18/330-board_leds.patch b/target/linux/ath25/patches-3.18/330-board_leds.patch
index e357fc6a64..e357fc6a64 100644
--- a/target/linux/atheros/patches-3.18/330-board_leds.patch
+++ b/target/linux/ath25/patches-3.18/330-board_leds.patch