diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 11:53:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 11:53:43 +0100 |
| commit | e18d7af85296cb6999aae171e8a9f8612bea5ae0 (patch) | |
| tree | 97a675ecc17bef2f710c50f5ea2a480df0e362c0 /arch/arm/Makefile | |
| parent | 3555105333ae55414d0fe051557bd7dc590f5255 (diff) | |
| parent | 8b1fae4e4200388b64dd88065639413cb3f1051c (diff) | |
| download | linux-e18d7af85296cb6999aae171e8a9f8612bea5ae0.tar.gz linux-e18d7af85296cb6999aae171e8a9f8612bea5ae0.tar.bz2 linux-e18d7af85296cb6999aae171e8a9f8612bea5ae0.zip | |
Merge commit 'v2.6.28-rc8' into x86/mm
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 7d5121260fda..bd6e28115ebb 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -141,7 +141,7 @@ endif machine-$(CONFIG_ARCH_MX3) := mx3 machine-$(CONFIG_ARCH_ORION5X) := orion5x plat-$(CONFIG_PLAT_ORION) := orion - machine-$(CONFIG_ARCH_MSM7X00A) := msm + machine-$(CONFIG_ARCH_MSM) := msm machine-$(CONFIG_ARCH_LOKI) := loki machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 |