projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bcedfa9 7126936)
ARM: Merge next-s3c64xx
authorBen Dooks <ben-linux@fluff.org>
Mon, 18 Jan 2010 00:35:29 +0000 (09:35 +0900)
committerBen Dooks <ben-linux@fluff.org>
Mon, 18 Jan 2010 00:35:29 +0000 (09:35 +0900)
Merge branch 'next-s3c64xx' into next-samsung

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

1  2 
arch/arm/mach-s3c6400/include/mach/map.h patch | diff1 | diff2 | blob | history
arch/arm/plat-s3c64xx/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-s3c6400/include/mach/map.h
index 5a35f24fcb80efc0967d8366aa13902dfb27215e,0552716d6bb2a2a11f0f599914fb72231471556f..c33810ed21b350dd6754d3d678ea7f6d28961b0b
--- 1/arch/arm/mach-s3c6400/include/mach/map.h
--- 2/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)
diff --cc arch/arm/plat-s3c64xx/Makefile
Simple merge