diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 20:24:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 20:24:30 -0700 |
| commit | 510597e26e2a072e2d46ea5bc57feaf385e37f70 (patch) | |
| tree | 5ffe90e6569481506b06fb6d6a409655fac4f7f6 /arch/arm/Makefile | |
| parent | cd9a0b6bd67ec372b0ef3cb2abe26974f888b956 (diff) | |
| parent | 4702abd3f9728893ad5b0f4389e1902588510459 (diff) | |
| download | blackbird-op-linux-510597e26e2a072e2d46ea5bc57feaf385e37f70.tar.gz blackbird-op-linux-510597e26e2a072e2d46ea5bc57feaf385e37f70.zip | |
Merge branch 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc
* 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc:
ARM: mach-nuc93x: delete
Fix up trivial delete/edit conflicts in
arch/arm/mach-nuc93x/{Makefile.boot,mach-nuc932evb.c,time.c}
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 5665c2a3b652..a5aac169af2a 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -192,7 +192,6 @@ machine-$(CONFIG_ARCH_VERSATILE) := versatile machine-$(CONFIG_ARCH_VEXPRESS) := vexpress machine-$(CONFIG_ARCH_VT8500) := vt8500 machine-$(CONFIG_ARCH_W90X900) := w90x900 -machine-$(CONFIG_ARCH_NUC93X) := nuc93x machine-$(CONFIG_FOOTBRIDGE) := footbridge machine-$(CONFIG_MACH_SPEAR300) := spear3xx machine-$(CONFIG_MACH_SPEAR310) := spear3xx |
