diff options
| author | Simon Guinot <sguinot@lacie.com> | 2010-02-08 19:08:34 +0100 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2010-05-03 17:03:18 -0400 |
| commit | 57475b1a47b3e891ce087ca3c6fc93f5a446a244 (patch) | |
| tree | 46a4c03171ffde72121c6be560854f9732c22eff /arch/arm/mach-kirkwood/Makefile | |
| parent | 3e05ec1b93cd839fa1d1a9961b155b0dbc9a4055 (diff) | |
| download | blackbird-op-linux-57475b1a47b3e891ce087ca3c6fc93f5a446a244.tar.gz blackbird-op-linux-57475b1a47b3e891ce087ca3c6fc93f5a446a244.zip | |
[ARM] Kirkwood: merge net2big_v2 and net5big_v2 board setups
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Diffstat (limited to 'arch/arm/mach-kirkwood/Makefile')
| -rw-r--r-- | arch/arm/mach-kirkwood/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile index bbb8dd3fa211..c0cd5d362002 100644 --- 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 |
