ARM: Merge for-2635/samsung-rtc

Merge branch 'for-2635/samsung-rtc' into for-linus/samsung2

Conflicts:
	arch/arm/mach-s3c64xx/include/mach/map.h
	arch/arm/plat-samsung/Kconfig
	arch/arm/plat-samsung/Makefile

diff --cc arch/arm/mach-s3c64xx/Makefile
index da662783493ab97f3e3512c5598d7d392d62cfb8,56ef97286b31681967b91ea13f29e54cb4377786..d78c3dd43a1addecd1589187f834cd0d561f5366
--- 1/arch/arm/mach-s3c64xx/Makefile
--- 2/arch/arm/mach-s3c64xx/Makefile
+++ b/arch/arm/mach-s3c64xx/Makefile
@@@ -56,6 -56,6 +56,5 @@@ obj-$(CONFIG_MACH_HMT)                += mach-hmt.
  # device support
  
  obj-y                         += dev-uart.o
- obj-y                         += dev-rtc.o
  obj-y                         += dev-audio.o
 -obj-$(CONFIG_S3C_ADC)         += dev-adc.o
  obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o

diff --cc arch/arm/mach-s3c64xx/include/mach/map.h
index 869c8e0251278092667f8c745c10ddd866f45afc,cce28a968164e760c786cdb3ab13a8a7407042ed..9fdd50c8c767473fed80df430b89de0a38bf7ec3
--- 1/arch/arm/mach-s3c64xx/include/mach/map.h
--- 2/arch/arm/mach-s3c64xx/include/mach/map.h
+++ b/arch/arm/mach-s3c64xx/include/mach/map.h
@@@ -103,6 -103,6 +103,8 @@@
  #define S3C_PA_USBHOST                S3C64XX_PA_USBHOST
  #define S3C_PA_USB_HSOTG      S3C64XX_PA_USB_HSOTG
  #define S3C_VA_USB_HSPHY      S3C64XX_VA_USB_HSPHY
+ #define S3C_PA_RTC            S3C64XX_PA_RTC
+ 
 +#define SAMSUNG_PA_ADC                S3C64XX_PA_ADC
 +
  #endif /* __ASM_ARCH_6400_MAP_H */

diff --cc arch/arm/plat-samsung/Kconfig
index 2f1b3d4a09b3f20cc6fa292321039f635bc4524d,f4a017df29a12ed626a6d97300d0ddc024fe9f61..c91c21ac5fcba514abaea27cf5341dab2103b034
--- 1/arch/arm/plat-samsung/Kconfig
--- 2/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@@ -190,11 -185,11 +190,16 @@@ config S3C_DEV_NAN
        help
          Compile in platform device definition for NAND controller
  
+ config S3C_DEV_RTC
+       bool
+       help
+         Complie in platform device definition for RTC
+ 
 +config SAMSUNG_DEV_ADC
 +      bool
 +      help
 +        Compile in platform device definition for ADC controller
 +
  config S3C64XX_DEV_SPI
        bool
        help

diff --cc arch/arm/plat-samsung/Makefile
index 761407fe8135adde22faffba22ed2d2744c7c812,4326c1be49364e08d2f56ba9b43db18e0e88d888..7068af322e73c7a168668ae77eff28c247c85cca
--- 1/arch/arm/plat-samsung/Makefile
--- 2/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@@ -41,8 -40,8 +41,10 @@@ obj-y                                += dev-uart.
  obj-$(CONFIG_S3C_DEV_USB_HOST)        += dev-usb.o
  obj-$(CONFIG_S3C_DEV_USB_HSOTG)       += dev-usb-hsotg.o
  obj-$(CONFIG_S3C_DEV_NAND)    += dev-nand.o
+ obj-$(CONFIG_S3C_DEV_RTC)     += dev-rtc.o
+ 
 +obj-$(CONFIG_SAMSUNG_DEV_ADC) += dev-adc.o
 +
  # DMA support
  
  obj-$(CONFIG_S3C_DMA)         += dma.o