Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-s5pv210/Makefile between commit 3fa754c298b7 ("ARM: 7248/1:
S5PV210: introduce arch/arm/mach-s5pv210/common.[ch]") from the arm tree
and commit a60879e7ca17 ("ARM: SAMSUNG: Remove SDHCI bus clocks from
platform data") from the s5p tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-s5pv210/Makefile
index 4c59186,471df5d..0000000
--- a/arch/arm/mach-s5pv210/Makefile
+++ b/arch/arm/mach-s5pv210/Makefile
@@@ -29,14 -27,12 +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