ARM: Merge next-samsung-s3c64xx-platdeletion

Merge branch 'next-samsung-s3c64xx-platdeletion' into next-samsung

Conflicts:

	arch/arm/mach-s3c64xx/Makefile (fixed)

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
index 893bcfc777082d9fdace08f8033bd3642b8ad509,5cda6e7cf86f1bb253a517355f671c8932db1c27..a2a941d98c25ceb0340a347462e98b07db175941
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -158,9 -158,9 +158,9 @@@ machine-$(CONFIG_ARCH_PNX4008)             := pnx4
  machine-$(CONFIG_ARCH_PXA)            := pxa
  machine-$(CONFIG_ARCH_REALVIEW)               := realview
  machine-$(CONFIG_ARCH_RPC)            := rpc
 -machine-$(CONFIG_ARCH_S3C2410)                := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
 +machine-$(CONFIG_ARCH_S3C2410)                := s3c2410 s3c2400 s3c2412 s3c2440 s3c2443
  machine-$(CONFIG_ARCH_S3C24A0)                := s3c24a0
- machine-$(CONFIG_ARCH_S3C64XX)                := s3c6400 s3c6410
+ machine-$(CONFIG_ARCH_S3C64XX)                := s3c64xx
  machine-$(CONFIG_ARCH_S5P6440)                := s5p6440
  machine-$(CONFIG_ARCH_S5PC1XX)                := s5pc100
  machine-$(CONFIG_ARCH_SA1100)         := sa1100

diff --cc arch/arm/mach-s3c64xx/Makefile
index 33a73f3e9f01ba6b5278948f7072e887c616c986,4417f1ad99b6dc543a2307b20ae563ac9e5b1db8..d1d341a14f75ed435b08565f029bdb8e66f7c963
--- 1/arch/arm/plat-s3c64xx/Makefile
--- 2/arch/arm/mach-s3c64xx/Makefile
+++ b/arch/arm/mach-s3c64xx/Makefile
@@@ -53,3 -39,23 +39,24 @@@ obj-$(CONFIG_S3C64XX_SETUP_SDHCI) += se
  obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
  obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
  
+ # PM
+ 
+ obj-$(CONFIG_PM)              += pm.o
+ obj-$(CONFIG_PM)              += sleep.o
+ obj-$(CONFIG_PM)              += irq-pm.o
+ 
+ # Machine support
+ 
+ obj-$(CONFIG_MACH_ANW6410)    += mach-anw6410.o
+ obj-$(CONFIG_MACH_SMDK6400)   += mach-smdk6400.o
+ obj-$(CONFIG_MACH_SMDK6410)   += mach-smdk6410.o
+ obj-$(CONFIG_MACH_NCP)                += mach-ncp.o
+ obj-$(CONFIG_MACH_HMT)                += mach-hmt.o
+ 
+ # device support
+ 
+ obj-y                         += dev-uart.o
+ obj-y                         += dev-rtc.o
+ obj-$(CONFIG_S3C_ADC)         += dev-adc.o
+ obj-$(CONFIG_SND_S3C24XX_SOC) += dev-audio.o
++obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o