From: Ben Dooks <ben-linux@fluff.org>
Date: Wed, 19 May 2010 09:07:25 +0000 (+0900)
Subject: ARM: Merge for-2635/samsung-rtc
X-Git-Tag: v2.6.35-rc1~500^2~16
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=14b8a0f92b309ff452a8c339abd9a096d00b210f

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
---

14b8a0f92b309ff452a8c339abd9a096d00b210f
diff --cc arch/arm/mach-s3c64xx/Makefile
index da66278,56ef972..d78c3dd
--- a/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 869c8e0,cce28a9..9fdd50c
--- a/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 2f1b3d4,f4a017d..c91c21a
--- a/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 761407f,4326c1b..7068af3
--- a/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