diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 10:48:02 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 10:48:02 -0400 |
| commit | 129961ecaf21c9ee899ad9067d917c1aa172fb7a (patch) | |
| tree | 49eafdcf4d6ac490ecdd92c36c285817872eaf34 /arch/arm/Makefile | |
| parent | 392c57a2ec811db37ae45adc513704cf92ba3e69 (diff) | |
| parent | cccf59abea4e1c36322e365d6e61ff7de1f3ee07 (diff) | |
Merge branch 'wells/lpc32xx-arch_v2' of git://git.lpclinux.com/linux-2.6-lpc into devel-stable
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 ddf6da158ad8..71cbb17ff89c 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -146,6 +146,7 @@ machine-$(CONFIG_ARCH_KS8695) := ks8695 | |||
| 146 | machine-$(CONFIG_ARCH_L7200) := l7200 | 146 | machine-$(CONFIG_ARCH_L7200) := l7200 |
| 147 | machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x | 147 | machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x |
| 148 | machine-$(CONFIG_ARCH_LOKI) := loki | 148 | machine-$(CONFIG_ARCH_LOKI) := loki |
| 149 | machine-$(CONFIG_ARCH_LPC32XX) := lpc32xx | ||
| 149 | machine-$(CONFIG_ARCH_MMP) := mmp | 150 | machine-$(CONFIG_ARCH_MMP) := mmp |
| 150 | machine-$(CONFIG_ARCH_MSM) := msm | 151 | machine-$(CONFIG_ARCH_MSM) := msm |
| 151 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 | 152 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 |