diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-09-20 16:15:55 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-09-20 16:15:55 -0400 |
| commit | da1c5afee092a2b51136ac3bf20c68bfff2924be (patch) | |
| tree | fa71b9e3af25c870012a22e4cb72547f9aafcfd0 /arch/arm/mach-exynos4/Makefile | |
| parent | 1fdb4888e45f1413972a8e9da55f3ffc08b9abcb (diff) | |
| parent | 4c59de052e7167a3bcf3f32c5ea4c9a5ef07386a (diff) | |
Merge branch 'samsung/cleanup' into next/cleanup
Diffstat (limited to 'arch/arm/mach-exynos4/Makefile')
| -rw-r--r-- | arch/arm/mach-exynos4/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-exynos4/Makefile index b7fe1d7b0b1f..e3e93ea41385 100644 --- a/arch/arm/mach-exynos4/Makefile +++ b/arch/arm/mach-exynos4/Makefile | |||
| @@ -25,7 +25,7 @@ obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o | |||
| 25 | 25 | ||
| 26 | # machine support | 26 | # machine support |
| 27 | 27 | ||
| 28 | obj-$(CONFIG_MACH_SMDKC210) += mach-smdkc210.o | 28 | obj-$(CONFIG_MACH_SMDKC210) += mach-smdkv310.o |
| 29 | obj-$(CONFIG_MACH_SMDKV310) += mach-smdkv310.o | 29 | obj-$(CONFIG_MACH_SMDKV310) += mach-smdkv310.o |
| 30 | obj-$(CONFIG_MACH_ARMLEX4210) += mach-armlex4210.o | 30 | obj-$(CONFIG_MACH_ARMLEX4210) += mach-armlex4210.o |
| 31 | obj-$(CONFIG_MACH_UNIVERSAL_C210) += mach-universal_c210.o | 31 | obj-$(CONFIG_MACH_UNIVERSAL_C210) += mach-universal_c210.o |