Merge branch 'samsung/dt' into samsung/cleanup

Conflicts:
	arch/arm/mach-s3c64xx/Makefile
	arch/arm/mach-s5pc100/Makefile
	arch/arm/mach-s5pv210/Makefile

Pull in previously resolved conflicts:

The Makefiles were reorganized in the "rmk/restart" series and modified
in the "samsung/cleanup series". This also pulls in the other conflict
resolutions from the restart series against the samsung/dt series.

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

diff --cc arch/arm/mach-exynos/Makefile
Simple merge

diff --cc arch/arm/mach-exynos/clock.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-nuri.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-smdkv310.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-universal_c210.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/Makefile
index d7d9bb5dfb72f47e3981cad00577f7eb32b0c266,f37016cebbe302c8b654f1e0dca096a6a5a00443..1822ac2eba318250f8b0cfd4163f516b18184eac
--- 1/arch/arm/mach-s3c64xx/Makefile
--- 2/arch/arm/mach-s3c64xx/Makefile
+++ b/arch/arm/mach-s3c64xx/Makefile
@@@ -26,21 -27,21 +27,21 @@@ obj-$(CONFIG_PM)           += pm.o irq-pm.o slee
  
  obj-$(CONFIG_S3C64XX_DMA)     += dma.o
  
- # Device setup
+ # Device support
  
- obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o
- obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o
- obj-$(CONFIG_S3C64XX_SETUP_IDE) += setup-ide.o
- obj-$(CONFIG_S3C64XX_SETUP_KEYPAD) += setup-keypad.o
- obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
- obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
- obj-$(CONFIG_S3C64XX_SETUP_SPI) += setup-spi.o
+ obj-y                         += dev-uart.o
+ obj-y                         += dev-audio.o
+ obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o
  
- # PM
+ # Device setup
  
- obj-$(CONFIG_PM)              += pm.o
- obj-$(CONFIG_PM)              += sleep.o
- obj-$(CONFIG_PM)              += irq-pm.o
+ obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP)  += setup-fb-24bpp.o
+ obj-$(CONFIG_S3C64XX_SETUP_I2C0)      += setup-i2c0.o
+ obj-$(CONFIG_S3C64XX_SETUP_I2C1)      += setup-i2c1.o
+ obj-$(CONFIG_S3C64XX_SETUP_IDE)               += setup-ide.o
+ obj-$(CONFIG_S3C64XX_SETUP_KEYPAD)    += setup-keypad.o
 -obj-$(CONFIG_S3C64XX_SETUP_SDHCI)     += setup-sdhci.o
+ obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO)        += setup-sdhci-gpio.o
++obj-$(CONFIG_S3C64XX_SETUP_SPI)               += setup-spi.o
  
  # Machine support
  

diff --cc arch/arm/mach-s3c64xx/clock.c
Simple merge

diff --cc arch/arm/mach-s5p64x0/Makefile
index a7d7a499d99ec7a43af402d15a71374903678870,d3f7409999f228134f3c189a29c8dc195195f913..e167ca136f5d91fd6c41a9b08abe5e4fb289f178
--- 1/arch/arm/mach-s5p64x0/Makefile
--- 2/arch/arm/mach-s5p64x0/Makefile
+++ b/arch/arm/mach-s5p64x0/Makefile
@@@ -26,7 -28,8 +28,8 @@@ obj-$(CONFIG_MACH_SMDK6450)   += mach-smd
  # device support
  
  obj-y                         += dev-audio.o
 -obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o
  
+ obj-y                                 += setup-i2c0.o
  obj-$(CONFIG_S5P64X0_SETUP_I2C1)      += setup-i2c1.o
  obj-$(CONFIG_S5P64X0_SETUP_FB_24BPP)  += setup-fb-24bpp.o
 +obj-$(CONFIG_S5P64X0_SETUP_SPI)               += setup-spi.o

diff --cc arch/arm/mach-s5p64x0/clock-s5p6440.c
Simple merge

diff --cc arch/arm/mach-s5p64x0/clock-s5p6450.c
Simple merge

diff --cc arch/arm/mach-s5pc100/Makefile
index 291e246c0ec01215409b0609ad63d99e1b5a7eda,c3166c4d2ace16896f8b76e91c470e754141384e..118c711f74e804203cd7a2f5613ea1abfe062554
--- 1/arch/arm/mach-s5pc100/Makefile
--- 2/arch/arm/mach-s5pc100/Makefile
+++ b/arch/arm/mach-s5pc100/Makefile
@@@ -32,4 -20,14 +20,13 @@@ obj-y                               += dma.
  obj-$(CONFIG_MACH_SMDKC100)   += mach-smdkc100.o
  
  # device support
+ 
  obj-y                         += dev-audio.o
 -obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o
+ 
+ obj-y                                 += setup-i2c0.o
+ obj-$(CONFIG_S5PC100_SETUP_FB_24BPP)  += setup-fb-24bpp.o
+ obj-$(CONFIG_S5PC100_SETUP_I2C1)      += setup-i2c1.o
+ obj-$(CONFIG_S5PC100_SETUP_IDE)               += setup-ide.o
+ obj-$(CONFIG_S5PC100_SETUP_KEYPAD)    += setup-keypad.o
 -obj-$(CONFIG_S5PC100_SETUP_SDHCI)     += setup-sdhci.o
+ obj-$(CONFIG_S5PC100_SETUP_SDHCI_GPIO)        += setup-sdhci-gpio.o
++obj-$(CONFIG_S5PC100_SETUP_SPI)               += setup-spi.o

diff --cc arch/arm/mach-s5pc100/clock.c
Simple merge

diff --cc arch/arm/mach-s5pv210/Makefile
index 471df5d2d25c82aadbeb7b73b5a36d3ddfdc7772,4c59186de9575c3ac3f0d82e4eef752dfff68f33..76a121dd52b434fd4ae865dbf8aa6685082c4d41
--- 1/arch/arm/mach-s5pv210/Makefile
--- 2/arch/arm/mach-s5pv210/Makefile
+++ b/arch/arm/mach-s5pv210/Makefile
@@@ -27,12 -29,14 +29,13 @@@ obj-$(CONFIG_MACH_TORBRECK)        += mach-tor
  # device support
  
  obj-y                         += dev-audio.o
 -obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o
  
+ obj-y                                 += setup-i2c0.o
  obj-$(CONFIG_S5PV210_SETUP_FB_24BPP)  += setup-fb-24bpp.o
  obj-$(CONFIG_S5PV210_SETUP_FIMC)      += setup-fimc.o
- obj-$(CONFIG_S5PV210_SETUP_I2C1)      += setup-i2c1.o
- obj-$(CONFIG_S5PV210_SETUP_I2C2)      += setup-i2c2.o
+ obj-$(CONFIG_S5PV210_SETUP_I2C1)      += setup-i2c1.o
+ obj-$(CONFIG_S5PV210_SETUP_I2C2)      += setup-i2c2.o
  obj-$(CONFIG_S5PV210_SETUP_IDE)               += setup-ide.o
  obj-$(CONFIG_S5PV210_SETUP_KEYPAD)    += setup-keypad.o
 -obj-$(CONFIG_S5PV210_SETUP_SDHCI)     += setup-sdhci.o
  obj-$(CONFIG_S5PV210_SETUP_SDHCI_GPIO)        += setup-sdhci-gpio.o
 +obj-$(CONFIG_S5PV210_SETUP_SPI)               += setup-spi.o

diff --cc arch/arm/mach-s5pv210/clock.c
Simple merge

diff --cc arch/arm/mach-s5pv210/mach-aquila.c
Simple merge

diff --cc arch/arm/mach-s5pv210/mach-goni.c
Simple merge

diff --cc arch/arm/mach-s5pv210/mach-smdkv210.c
Simple merge

diff --cc drivers/mmc/host/sdhci-s3c.c
Simple merge