linux-next: manual merge of the s5p tree with the arm tree

From: Stephen Rothwell
Date: Tue Dec 27 2011 - 18:18:25 EST

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-s5pc100/Makefile between commit dd4153d9af67 ("ARM: 7247/1:
S5PC100: introduce arch/arm/mach-s5pc100/common.[ch]") from the arm tree
and commit a60879e7ca17 ("ARM: SAMSUNG: Remove SDHCI bus clocks from
platform data"), 875a59374cd1 ("ARM: SAMSUNG: Consolidation of SPI
platform devices to plat-samsung") and 323d7717455e ("ARM: S5PC100:
Modified files for SPI consolidation work") from the s5p tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-s5pc100/Makefile
index c3166c4,291e246..0000000
--- a/arch/arm/mach-s5pc100/Makefile
+++ b/arch/arm/mach-s5pc100/Makefile
@@@ -20,14 -32,4 +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

Attachment: pgp00000.pgp
Description: PGP signature