From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 9 Apr 2013 13:31:57 +0000 (+0200)
Subject: Merge tag 'cleanup-samsung-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.10-rc1~125^2~7
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4909e13cd9d864f95f63d2d16489778fff483460;p=uclinux-h8%2Flinux.git

Merge tag 'cleanup-samsung-for-v3.10' of git://git./linux/kernel/git/kgene/linux-samsung into next/cleanup

From Kukjin Kim <kgene.kim@samsung.com>:

cleanup unused codes for samsung

* tag 'cleanup-samsung-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: remove "config EXYNOS_DEV_DRM"
  ARM: EXYNOS: change the name of USB ohci header
  ARM: SAMSUNG: Remove unnecessary code for dma
  ARM: S3C24XX: Remove unused GPIO drive strength register definitions
  ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2412
  ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2410
  ARM: S3C24XX: Removed unneeded dependency on ARCH_S3C24XX for boards
  ARM: SAMSUNG: Fix typo "CONFIG_SAMSUNG_DEV_RTC"
  ARM: S5P64X0: Fix typo "CONFIG_S5P64X0_SETUP_SDHCI"
  ARM: S3C64XX: remove obsolete Makefile line
  ARM: S3C24XX: remove unneeded "config SMDK2440_CPU2442"
  ARM: SAMSUNG: Remove useless Samsung GPIO related CONFIG
  ARM: SAMSUNG: remove "config S3C_BOOT_WATCHDOG"
  ARM: EXYNOS: change HAVE_SAMSUNG_KEYPAD to KEYBOARD_SAMSUNG
  ARM: EXYNOS: remove duplicated include from common.c
  ARM: EXYNOS: drop "select HAVE_SCHED_CLOCK"
  ARM: S3C24XX: drop "select MACH_NEO1973"
  ARM: S3C24XX: drop "select MACH_N35"

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

4909e13cd9d864f95f63d2d16489778fff483460
diff --cc arch/arm/mach-exynos/common.c
index 7bc0f9aa8b33,01e4089dd310..1b0fa7afc7f8
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@@ -23,10 -23,8 +23,9 @@@
  #include <linux/of_irq.h>
  #include <linux/export.h>
  #include <linux/irqdomain.h>
- #include <linux/irqchip.h>
  #include <linux/of_address.h>
  #include <linux/irqchip/arm-gic.h>
 +#include <linux/irqchip/chained_irq.h>
  
  #include <asm/proc-fns.h>
  #include <asm/exception.h>