From: Russell King Date: Wed, 10 Jun 2009 21:40:55 +0000 (+0100) Subject: Merge branch for-rmk-devel of git://aeryn.fluff.org.uk/bjdooks/linux into devel X-Git-Tag: upstream/snapshot3+hdmi~18622^2~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=547c32aeb5a24178ef20488ae0508efcc32ae8e4;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge branch for-rmk-devel of git://aeryn.fluff.org.uk/bjdooks/linux into devel --- 547c32aeb5a24178ef20488ae0508efcc32ae8e4 diff --cc arch/arm/mach-s3c6400/include/mach/map.h index 8199972,7a1e5a2..5057d99 --- a/arch/arm/mach-s3c6400/include/mach/map.h +++ b/arch/arm/mach-s3c6400/include/mach/map.h @@@ -39,9 -39,9 +39,11 @@@ #define S3C_VA_UART3 S3C_VA_UARTx(3) #define S3C64XX_PA_FB (0x77100000) + #define S3C64XX_PA_USB_HSOTG (0x7C000000) + #define S3C64XX_PA_WATCHDOG (0x7E004000) #define S3C64XX_PA_SYSCON (0x7E00F000) +#define S3C64XX_PA_IIS0 (0x7F002000) +#define S3C64XX_PA_IIS1 (0x7F003000) #define S3C64XX_PA_TIMER (0x7F006000) #define S3C64XX_PA_IIC0 (0x7F004000) #define S3C64XX_PA_IIC1 (0x7F00F000)