summaryrefslogtreecommitdiff
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-05-26 00:47:48 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-26 00:47:48 +0400
commit586893ebc42943008010b4c210cfc9167df615e5 (patch)
treeeec3179235978fba9ca6bfae0799d97c8532ee15 /arch/arm/Makefile
parent014322dac6ae0048c928c6ca2faf0d53194f9d15 (diff)
parentbd6356bdafc853201168f718f0059fbe11191461 (diff)
downloadlinux-586893ebc42943008010b4c210cfc9167df615e5.tar.xz
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts: arch/arm/Kconfig arch/arm/mach-exynos4/mach-nuri.c
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r--arch/arm/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 25750bcb3397..f5b2b390c8f2 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -176,7 +176,6 @@ machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2416 s3c2440 s3c24
machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0
machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx
machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0
-machine-$(CONFIG_ARCH_S5P6442) := s5p6442
machine-$(CONFIG_ARCH_S5PC100) := s5pc100
machine-$(CONFIG_ARCH_S5PV210) := s5pv210
machine-$(CONFIG_ARCH_EXYNOS4) := exynos4