From: Kukjin Kim <kgene.kim@samsung.com>
Date: Tue, 18 Jun 2013 19:16:18 +0000 (+0900)
Subject: Merge branch 'v3.11-next/remove-nondt-exynos-3' into for-next
X-Git-Tag: next-20130619~9^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=867984e160c1b8cbbbed2402f79d29dda0590796;p=karo-tx-linux.git

Merge branch 'v3.11-next/remove-nondt-exynos-3' into for-next

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-exynos/Kconfig
---

867984e160c1b8cbbbed2402f79d29dda0590796
diff --cc arch/arm/Kconfig
index 7f6dff7826a2,14f6e1138e88..ddf2667c1fef
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -745,7 -749,7 +750,8 @@@ config ARCH_S5P64X
  	select HAVE_S3C2410_WATCHDOG if WATCHDOG
  	select HAVE_S3C_RTC if RTC_CLASS
  	select NEED_MACH_GPIO_H
+ 	select SAMSUNG_ATAGS
 +	select SAMSUNG_WDT_RESET
  	help
  	  Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,
  	  SMDK6450.
@@@ -762,7 -767,7 +769,8 @@@ config ARCH_S5PC10
  	select HAVE_S3C2410_WATCHDOG if WATCHDOG
  	select HAVE_S3C_RTC if RTC_CLASS
  	select NEED_MACH_GPIO_H
+ 	select SAMSUNG_ATAGS
 +	select SAMSUNG_WDT_RESET
  	help
  	  Samsung S5PC100 series based systems
  
diff --cc arch/arm/mach-exynos/Kconfig
index e51d99060d33,46c8332476f8..1e0e3999c17a
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@@ -418,8 -96,9 +101,7 @@@ config MACH_EXYNOS4_D
  	select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210
  	select CPU_EXYNOS4210
  	select KEYBOARD_SAMSUNG if INPUT_KEYBOARD
 -	select PINCTRL
 -	select PINCTRL_EXYNOS
  	select S5P_DEV_MFC
- 	select USE_OF
  	help
  	  Machine support for Samsung Exynos4 machine with device tree enabled.
  	  Select this if a fdt blob is available for the Exynos4 SoC based board.
@@@ -432,8 -111,6 +114,7 @@@ config MACH_EXYNOS5_D
  	depends on ARCH_EXYNOS5
  	select ARM_AMBA
  	select CLKSRC_OF
 +	select USB_ARCH_HAS_XHCI
- 	select USE_OF
  	help
  	  Machine support for Samsung EXYNOS5 machine with device tree enabled.
  	  Select this if a fdt blob is available for the EXYNOS5 SoC based board.
diff --cc arch/arm/plat-samsung/Makefile
index 03cea140cfd0,6348ae2e3b46..98d07d8fc7a7
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@@ -56,7 -56,7 +56,8 @@@ obj-$(CONFIG_SAMSUNG_PM_GPIO)	+= pm-gpi
  obj-$(CONFIG_SAMSUNG_PM_CHECK)	+= pm-check.o
  
  obj-$(CONFIG_SAMSUNG_WAKEMASK)	+= wakeup-mask.o
 +obj-$(CONFIG_SAMSUNG_WDT_RESET)	+= watchdog-reset.o
  
- obj-$(CONFIG_S5P_PM)		+= s5p-pm.o s5p-irq-pm.o
+ obj-$(CONFIG_S5P_PM)		+= s5p-pm.o
+ obj-$(CONFIG_S5P_IRQ_PM)	+= s5p-irq-pm.o
  obj-$(CONFIG_S5P_SLEEP)		+= s5p-sleep.o