From: Ben Dooks <ben-linux@fluff.org>
Date: Mon, 18 Jan 2010 00:35:29 +0000 (+0900)
Subject: ARM: Merge next-s3c64xx
X-Git-Tag: v2.6.34-rc2~66^2~54^2~25^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0084f27a21d36ac846cd4366289c229a7cce511b;p=karo-tx-linux.git

ARM: Merge next-s3c64xx

Merge branch 'next-s3c64xx' into next-samsung

Conflicts:
	arch/arm/mach-s3c6400/include/mach/map.h
	( ADC and RTC PA merge fixed)
---

0084f27a21d36ac846cd4366289c229a7cce511b
diff --cc arch/arm/mach-s3c6400/include/mach/map.h
index 5a35f24fcb80,0552716d6bb2..c33810ed21b3
--- a/arch/arm/mach-s3c6400/include/mach/map.h
+++ b/arch/arm/mach-s3c6400/include/mach/map.h
@@@ -42,7 -42,7 +42,8 @@@
  #define S3C64XX_PA_FB		(0x77100000)
  #define S3C64XX_PA_USB_HSOTG	(0x7C000000)
  #define S3C64XX_PA_WATCHDOG	(0x7E004000)
+ #define S3C64XX_PA_RTC		(0x7E005000)
 +#define S3C64XX_PA_ADC		(0x7E00B000)
  #define S3C64XX_PA_SYSCON	(0x7E00F000)
  #define S3C64XX_PA_AC97		(0x7F001000)
  #define S3C64XX_PA_IIS0		(0x7F002000)