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 --combined arch/arm/mach-s3c64xx/Makefile
index da66278,56ef972..d78c3dd
--- 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 --combined arch/arm/mach-s3c64xx/include/mach/map.h
index 869c8e0,cce28a9..9fdd50c
--- 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 --combined arch/arm/plat-samsung/Kconfig
index 2f1b3d4,f4a017d..c91c21a
--- 1/arch/arm/plat-samsung/Kconfig
--- 2/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@@ -160,11 -160,6 +160,11 @@@ config S3C_DEV_HSMMC
        help
          Compile in platform device definitions for HSMMC channel 2
  
 +config S3C_DEV_HWMON
 +      bool
 +      help
 +          Compile in platform device definitions for HWMON
 +
  config S3C_DEV_I2C1
        bool
        help
@@@ -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
@@@ -208,12 -203,6 +213,12 @@@ config S3C_DM
        help
          Internal configuration for S3C DMA core
  
 +config S3C_PL330_DMA
 +      bool
 +      select PL330
 +      help
 +        S3C DMA API Driver for PL330 DMAC.
 +
  comment "Power management"
  
  config SAMSUNG_PM_DEBUG

diff --combined arch/arm/plat-samsung/Makefile
index 761407f,4326c1b..7068af3
--- 1/arch/arm/plat-samsung/Makefile
--- 2/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@@ -33,7 -33,6 +33,7 @@@ obj-$(CONFIG_S3C_ADC) += adc.
  obj-$(CONFIG_S3C_DEV_HSMMC)   += dev-hsmmc.o
  obj-$(CONFIG_S3C_DEV_HSMMC1)  += dev-hsmmc1.o
  obj-$(CONFIG_S3C_DEV_HSMMC2)  += dev-hsmmc2.o
 +obj-$(CONFIG_S3C_DEV_HWMON)   += dev-hwmon.o
  obj-y                         += dev-i2c0.o
  obj-$(CONFIG_S3C_DEV_I2C1)    += dev-i2c1.o
  obj-$(CONFIG_S3C_DEV_FB)      += dev-fb.o
@@@ -41,14 -40,12 +41,16 @@@ 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
  
 +obj-$(CONFIG_S3C_PL330_DMA)   += s3c-pl330.o
 +
  # PM support
  
  obj-$(CONFIG_PM)              += pm.o