[ARM] Kirkwood: merge net2big_v2 and net5big_v2 board setups

Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
mariux64 · May 3, 2010 · 57475b1 · 57475b1
1 parent 3e05ec1
commit 57475b1
Show file tree

Hide file tree

Showing 3 changed files with 120 additions and 394 deletions.
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
@@ -12,7 +12,7 @@ obj-$(CONFIG_MACH_TS41X)		+= ts41x-setup.o tsx1x-common.o
 obj-$(CONFIG_MACH_OPENRD)		+= openrd-setup.o
 obj-$(CONFIG_MACH_NETSPACE_V2)		+= netspace_v2-setup.o
 obj-$(CONFIG_MACH_INETSPACE_V2)		+= netspace_v2-setup.o
-obj-$(CONFIG_MACH_NET2BIG_V2)		+= net2big_v2-setup.o
-obj-$(CONFIG_MACH_NET5BIG_V2)		+= net5big_v2-setup.o
+obj-$(CONFIG_MACH_NET2BIG_V2)		+= netxbig_v2-setup.o
+obj-$(CONFIG_MACH_NET5BIG_V2)		+= netxbig_v2-setup.o
 
 obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o
diff --git a/arch/arm/mach-kirkwood/net2big_v2-setup.c b/arch/arm/mach-kirkwood/net2big_v2-setup.c