From 2769ed671f66a0b5850abe7ff65587a4bb20e448 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 6 Aug 2009 12:55:23 +0000
Subject: [PATCH] atheros: rename CONFIG_ATHEROS to CONFIG_ATHEROS_AR231X

SVN-Revision: 17145
---
 target/linux/atheros/config-2.6.30                   |  4 ++--
 target/linux/atheros/patches-2.6.30/100-board.patch  | 12 ++++++------
 .../atheros/patches-2.6.30/110-ar2313_ethernet.patch |  2 +-
 .../linux/atheros/patches-2.6.30/130-watchdog.patch  |  2 +-
 .../081-mtd_myloader_partition_parser.patch          |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/target/linux/atheros/config-2.6.30 b/target/linux/atheros/config-2.6.30
index 54c6d96ae0..da589a4517 100644
--- a/target/linux/atheros/config-2.6.30
+++ b/target/linux/atheros/config-2.6.30
@@ -9,9 +9,9 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUPPORTS_OPROFILE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ATHEROS=y
 CONFIG_ATHEROS_AR2315=y
 CONFIG_ATHEROS_AR2315_PCI=y
+CONFIG_ATHEROS_AR231X=y
 CONFIG_ATHEROS_AR5312=y
 CONFIG_ATHEROS_WDT=y
 CONFIG_BASE_SMALL=0
@@ -102,6 +102,7 @@ CONFIG_IRQ_CPU=y
 # CONFIG_MIKROTIK_RB532 is not set
 CONFIG_MIPS=y
 # CONFIG_MIPS_COBALT is not set
+# CONFIG_MIPS_FPU_EMU is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MACHINE is not set
 # CONFIG_MIPS_MALTA is not set
@@ -125,7 +126,6 @@ CONFIG_MVSWITCH_PHY=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
-# CONFIG_PCI_STUB is not set
 # CONFIG_PCSPKR_PLATFORM is not set
 CONFIG_PHYLIB=y
 # CONFIG_PMC_MSP is not set
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 bfa7d6bd87..4367ce413d 100644
--- a/target/linux/atheros/patches-2.6.30/100-board.patch
+++ b/target/linux/atheros/patches-2.6.30/100-board.patch
@@ -4,7 +4,7 @@
  	help
  	 Support for BCM47XX based boards
  
-+config ATHEROS
++config ATHEROS_AR231X
 +	bool "Atheros 231x/531x SoC support"
 +	select CEVT_R4K
 +	select CSRC_R4K
@@ -36,9 +36,9 @@
  #
 +# Atheros AR5312/AR2312 WiSoC
 +#
-+core-$(CONFIG_ATHEROS)		+= arch/mips/ar231x/
-+cflags-$(CONFIG_ATHEROS)	+= -I$(srctree)/arch/mips/include/asm/mach-ar231x
-+load-$(CONFIG_ATHEROS)		+= 0xffffffff80041000
++core-$(CONFIG_ATHEROS_AR231X)		+= arch/mips/ar231x/
++cflags-$(CONFIG_ATHEROS_AR231X)	+= -I$(srctree)/arch/mips/include/asm/mach-ar231x
++load-$(CONFIG_ATHEROS_AR231X)		+= 0xffffffff80041000
 +
 +#
  # Cobalt Server
@@ -49,12 +49,12 @@
 @@ -0,0 +1,17 @@
 +config ATHEROS_AR5312
 +	bool "Atheros 5312/2312+ support"
-+	depends on ATHEROS
++	depends on ATHEROS_AR231X
 +	default y
 +
 +config ATHEROS_AR2315
 +	bool "Atheros 2315+ support"
-+	depends on ATHEROS
++	depends on ATHEROS_AR231X
 +	select DMA_NONCOHERENT
 +	select CEVT_R4K
 +	select CSRC_R4K
diff --git a/target/linux/atheros/patches-2.6.30/110-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.30/110-ar2313_ethernet.patch
index cd1774176b..5c28ae8b79 100644
--- a/target/linux/atheros/patches-2.6.30/110-ar2313_ethernet.patch
+++ b/target/linux/atheros/patches-2.6.30/110-ar2313_ethernet.patch
@@ -6,7 +6,7 @@
  
 +config AR231X_ETHERNET
 +	tristate "AR231x Ethernet support"
-+	depends on NET_ETHERNET && ATHEROS
++	depends on ATHEROS_AR231X
 +	help
 +	  Support for the AR231x/531x ethernet controller
 +
diff --git a/target/linux/atheros/patches-2.6.30/130-watchdog.patch b/target/linux/atheros/patches-2.6.30/130-watchdog.patch
index b0a0f59fc2..dcff4cb046 100644
--- a/target/linux/atheros/patches-2.6.30/130-watchdog.patch
+++ b/target/linux/atheros/patches-2.6.30/130-watchdog.patch
@@ -209,7 +209,7 @@
  
 +config ATHEROS_WDT
 +	tristate "Atheros wisoc Watchdog Timer"
-+	depends on ATHEROS
++	depends on ATHEROS_AR231X
 +	help
 +	  Hardware driver for the Atheros wisoc Watchdog Timer.
 +
diff --git a/target/linux/generic-2.6/patches-2.6.30/081-mtd_myloader_partition_parser.patch b/target/linux/generic-2.6/patches-2.6.30/081-mtd_myloader_partition_parser.patch
index 503fce6c3f..3ec97c6d8c 100644
--- a/target/linux/generic-2.6/patches-2.6.30/081-mtd_myloader_partition_parser.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/081-mtd_myloader_partition_parser.patch
@@ -6,7 +6,7 @@
  
 +config MTD_MYLOADER_PARTS
 +	tristate "MyLoader partition parsing"
-+	depends on MTD_PARTITIONS && (ADM5120 || ATHEROS || ATHEROS_AR71XX)
++	depends on MTD_PARTITIONS && (ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX)
 +	---help---
 +	  MyLoader is a bootloader which allows the user to define partitions
 +	  in flash devices, by putting a table in the second erase block
-- 
2.25.1