diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-14 06:01:44 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-14 06:01:44 -0400 |
| commit | b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc (patch) | |
| tree | c65b81ef9ae5076d2137034accfa2610f45a13de /arch/arm/Makefile | |
| parent | 06099961002a813324d057a91695af7c72939da6 (diff) | |
| parent | 7666c17e2b0986a079da46122d8658544416c2cf (diff) | |
Merge branch 'u300' into devel
Conflicts:
arch/arm/Makefile
Updates:
arch/arm/mach-u300/core.c
arch/arm/mach-u300/timer.c
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 2f3cac809e31..c877d6df23d1 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -154,6 +154,7 @@ machine-$(CONFIG_ARCH_SA1100) := sa1100 | |||
| 154 | machine-$(CONFIG_ARCH_SHARK) := shark | 154 | machine-$(CONFIG_ARCH_SHARK) := shark |
| 155 | machine-$(CONFIG_ARCH_STMP378X) := stmp378x | 155 | machine-$(CONFIG_ARCH_STMP378X) := stmp378x |
| 156 | machine-$(CONFIG_ARCH_STMP37XX) := stmp37xx | 156 | machine-$(CONFIG_ARCH_STMP37XX) := stmp37xx |
| 157 | machine-$(CONFIG_ARCH_U300) := u300 | ||
| 157 | machine-$(CONFIG_ARCH_VERSATILE) := versatile | 158 | machine-$(CONFIG_ARCH_VERSATILE) := versatile |
| 158 | machine-$(CONFIG_ARCH_W90X900) := w90x900 | 159 | machine-$(CONFIG_ARCH_W90X900) := w90x900 |
| 159 | machine-$(CONFIG_FOOTBRIDGE) := footbridge | 160 | machine-$(CONFIG_FOOTBRIDGE) := footbridge |