From: Ben Dooks <ben-linux@fluff.org>
Date: Tue, 19 Jan 2010 08:42:02 +0000 (+0900)
Subject: ARM: Merge next-samsung-mc-adc
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8e2376ab1086b2bff18fdb887f5bc13740ae6e24;p=deliverable%2Flinux.git

ARM: Merge next-samsung-mc-adc

Merge branch 'next-samsung-mc-adc' into next-samsung-try5

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

8e2376ab1086b2bff18fdb887f5bc13740ae6e24
diff --cc arch/arm/mach-s3c6400/include/mach/map.h
index 0552716d6bb2,5a35f24fcb80..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)