diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-08-14 15:23:45 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-08-14 15:23:45 +0100 |
| commit | 215ed3236a17b748cf75a2c23f50028c95302a42 (patch) | |
| tree | a1fa16573704a4a1bb646365f5d4c6cd3bb321f9 /arch/arm/mach-s3c6400 | |
| parent | 0fbdd270078a3e3ce537a2fb6ffc8a9b2427500c (diff) | |
| parent | e6d197a6954c8a9ff85727c31ca61fc1da78628a (diff) | |
| download | linux-215ed3236a17b748cf75a2c23f50028c95302a42.tar.bz2 | |
Merge branch 'next-s3c24xx-cpufreq' into next-s3c
Diffstat (limited to 'arch/arm/mach-s3c6400')
| -rw-r--r-- | arch/arm/mach-s3c6400/include/mach/map.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c6400/include/mach/map.h b/arch/arm/mach-s3c6400/include/mach/map.h index 5057d9948d35..e02e6c38a396 100644 --- a/arch/arm/mach-s3c6400/include/mach/map.h +++ b/arch/arm/mach-s3c6400/include/mach/map.h @@ -49,7 +49,7 @@ #define S3C64XX_PA_IIC1 (0x7F00F000) #define S3C64XX_PA_GPIO (0x7F008000) -#define S3C64XX_VA_GPIO S3C_ADDR(0x00500000) +#define S3C64XX_VA_GPIO S3C_ADDR_CPU(0x00000000) #define S3C64XX_SZ_GPIO SZ_4K #define S3C64XX_PA_SDRAM (0x50000000) @@ -57,7 +57,7 @@ #define S3C64XX_PA_VIC1 (0x71300000) #define S3C64XX_PA_MODEM (0x74108000) -#define S3C64XX_VA_MODEM S3C_ADDR(0x00600000) +#define S3C64XX_VA_MODEM S3C_ADDR_CPU(0x00100000) #define S3C64XX_PA_USBHOST (0x74300000) |