diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
| commit | d702d12167a2c05a346f49aac7a311d597762495 (patch) | |
| tree | baae42c299cce34d6df24b5d01f8b1d0b481bd9a /arch/arm/Makefile | |
| parent | 9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11 (diff) | |
| parent | ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 (diff) | |
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts:
arch/arm/plat-omap/Kconfig
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 356d702c0808..81f54ca30788 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -171,6 +171,7 @@ machine-$(CONFIG_ARCH_U300) := u300 | |||
| 171 | machine-$(CONFIG_ARCH_U8500) := ux500 | 171 | machine-$(CONFIG_ARCH_U8500) := ux500 |
| 172 | machine-$(CONFIG_ARCH_VERSATILE) := versatile | 172 | machine-$(CONFIG_ARCH_VERSATILE) := versatile |
| 173 | machine-$(CONFIG_ARCH_W90X900) := w90x900 | 173 | machine-$(CONFIG_ARCH_W90X900) := w90x900 |
| 174 | machine-$(CONFIG_ARCH_NUC93X) := nuc93x | ||
| 174 | machine-$(CONFIG_FOOTBRIDGE) := footbridge | 175 | machine-$(CONFIG_FOOTBRIDGE) := footbridge |
| 175 | 176 | ||
| 176 | # Platform directory name. This list is sorted alphanumerically | 177 | # Platform directory name. This list is sorted alphanumerically |