From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 9 Jan 2012 16:01:00 +0000 (+0000)
Subject: Merge branch 'samsung/dt' into samsung/cleanup
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a07613a54d700a974f3a4a657da78ef5d097315d;p=linux-beck.git

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>
---

a07613a54d700a974f3a4a657da78ef5d097315d
diff --cc arch/arm/mach-s3c64xx/Makefile
index d7d9bb5dfb72,f37016cebbe3..1822ac2eba31
--- a/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-s5p64x0/Makefile
index a7d7a499d99e,d3f7409999f2..e167ca136f5d
--- a/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-s5pc100/Makefile
index 291e246c0ec0,c3166c4d2ace..118c711f74e8
--- a/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-s5pv210/Makefile
index 471df5d2d25c,4c59186de957..76a121dd52b4
--- a/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