X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/04aff2e833edde651fb7b4792439d9e05fbfaee2..82bbacf365a65831e9cf70938ce96d732fb97078:/target/linux/atheros/patches-2.6.30/100-board.patch

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 052e887d2..4367ce413 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
@@ -20,7 +20,7 @@
  config MIPS_COBALT
  	bool "Cobalt Server"
  	select CEVT_R4K
-@@ -632,6 +645,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
+@@ -633,6 +646,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
  
  endchoice
  
@@ -30,15 +30,15 @@
  source "arch/mips/jazz/Kconfig"
 --- a/arch/mips/Makefile
 +++ b/arch/mips/Makefile
-@@ -290,6 +290,13 @@ libs-$(CONFIG_MIPS_XXS1500)	+= arch/mips
+@@ -283,6 +283,13 @@ libs-$(CONFIG_MIPS_XXS1500)	+= arch/mips
  load-$(CONFIG_MIPS_XXS1500)	+= 0xffffffff80100000
  
  #
 +# 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
@@ -2929,7 +2929,7 @@
 +#endif
 --- /dev/null
 +++ b/arch/mips/ar231x/devices.c
-@@ -0,0 +1,174 @@
+@@ -0,0 +1,175 @@
 +#include <linux/kernel.h>
 +#include <linux/init.h>
 +#include <linux/serial.h>
@@ -2945,6 +2945,7 @@
 +struct ar231x_board_config ar231x_board;
 +int ar231x_devtype = DEV_TYPE_UNKNOWN;
 +const struct ar231x_gpiodev *ar231x_gpiodev;
++EXPORT_SYMBOL(ar231x_gpiodev);
 +
 +static struct resource ar231x_eth0_res[] = {
 +	{