From: Olof Johansson Date: Mon, 28 Oct 2013 04:31:00 +0000 (-0700) Subject: Merge tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene... X-Git-Tag: v3.13-rc1~160^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6251c156a6cde0137d883babedb13bcfbb4a0941;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge tag 'samsung-cleanup' of git://git./linux/kernel/git/kgene/linux-samsung into next/cleanup From Kukjin Kim: Samsung Cleanup for v3.13 - remove unnecessary config options and header inclusions - use CONFIG_ARCH_S3C64XX instead of PLAT_S3C64XX * tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: remove CONFIG_MACH_EXYNOS[4, 5]_DT config options ARM: EXYNOS: remove unnecessary header inclusions from exynos4/5 dt machine file ARM: S3C64XX: Kill CONFIG_PLAT_S3C64XX ASoC: samsung: Use CONFIG_ARCH_S3C64XX to check for S3C64XX support s3c-camif: Use CONFIG_ARCH_S3C64XX to check for S3C64XX support gpio: samsung: Use CONFIG_ARCH_S3C64XX to check for S3C64XX support ARM: S3C64XX: Move if ARCH_S3C64XX statement into mach-s3c64xx Signed-off-by: Olof Johansson --- 6251c156a6cde0137d883babedb13bcfbb4a0941