diff options
| author | Kevin Wells <wellsk40@gmail.com> | 2010-07-28 03:38:52 -0700 |
|---|---|---|
| committer | Kevin Wells <wellsk40@gmail.com> | 2010-07-28 03:38:52 -0700 |
| commit | cccf59abea4e1c36322e365d6e61ff7de1f3ee07 (patch) | |
| tree | 376b61082713ca866c85318c034c8155124a07af /arch/arm/Makefile | |
| parent | fc0f5ac8fe693d1b05f5a928cc48135d1c8b7f2e (diff) | |
| parent | 408059495a372f1a9845672e58608fb6d8ec0c40 (diff) | |
| download | linux-cccf59abea4e1c36322e365d6e61ff7de1f3ee07.tar.gz linux-cccf59abea4e1c36322e365d6e61ff7de1f3ee07.tar.bz2 linux-cccf59abea4e1c36322e365d6e61ff7de1f3ee07.zip | |
Merge branch 'test' of ../test/linux-2.6-lpc2 into wells/lpc32xx-arch_v2
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 64ba313724d2..6a612c5483ce 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -142,6 +142,7 @@ machine-$(CONFIG_ARCH_KS8695) := ks8695 machine-$(CONFIG_ARCH_L7200) := l7200 machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x machine-$(CONFIG_ARCH_LOKI) := loki +machine-$(CONFIG_ARCH_LPC32XX) := lpc32xx machine-$(CONFIG_ARCH_MMP) := mmp machine-$(CONFIG_ARCH_MSM) := msm machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 |