Merge branch 'samsung/cleanup' into next/boards

Conflicts:
	arch/arm/mach-imx/mach-imx6q.c
	arch/arm/mach-omap2/board-ti8168evm.c
	arch/arm/mach-s3c64xx/Kconfig
	arch/arm/mach-tegra/Makefile
	arch/arm/mach-tegra/board-dt-tegra20.c
	arch/arm/mach-tegra/common.c

Lots of relatively simple conflicts between the board
changes and stuff from the arm tree. This pulls in
the resolution from the samsung/cleanup tree, so we
don't get conflicting merges.

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

1 files changed, 14 insertions, 2 deletions

diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index bb0af66bb487..6a2abe67c8b2 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -234,11 +234,23 @@ config SAMSUNG_DEV_IDE
         help
           Compile in platform device definitions for IDE
 
-config S3C64XX_DEV_SPI
+config S3C64XX_DEV_SPI0
         bool
         help
           Compile in platform device definitions for S3C64XX's type
-          SPI controllers.
+          SPI controller 0
+
+config S3C64XX_DEV_SPI1
+        bool
+        help
+          Compile in platform device definitions for S3C64XX's type
+          SPI controller 1
+
+config S3C64XX_DEV_SPI2
+        bool
+        help
+          Compile in platform device definitions for S3C64XX's type
+          SPI controller 2
 
 config SAMSUNG_DEV_TS
         bool