diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-27 07:38:02 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-27 07:38:02 -0400 |
| commit | 5292ae11babca23c3ff82593630d2d7eebc350a9 (patch) | |
| tree | 30a6c8123b35686098f306ea39398b7621f42054 /arch/arm/Makefile | |
| parent | b0f209898f1a177bd503d49215b8c6628797a81c (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into x86/uv
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 | |||
| 141 | machine-$(CONFIG_ARCH_MX3) := mx3 | 141 | machine-$(CONFIG_ARCH_MX3) := mx3 |
| 142 | machine-$(CONFIG_ARCH_ORION5X) := orion5x | 142 | machine-$(CONFIG_ARCH_ORION5X) := orion5x |
| 143 | plat-$(CONFIG_PLAT_ORION) := orion | 143 | plat-$(CONFIG_PLAT_ORION) := orion |
| 144 | machine-$(CONFIG_ARCH_MSM7X00A) := msm | 144 | machine-$(CONFIG_ARCH_MSM) := msm |
| 145 | machine-$(CONFIG_ARCH_LOKI) := loki | 145 | machine-$(CONFIG_ARCH_LOKI) := loki |
| 146 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 | 146 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 |
| 147 | 147 | ||