diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 17:02:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 17:02:16 -0400 |
| commit | be15cd72d256e5eb3261a781b8507fac83ab33f6 (patch) | |
| tree | 1a8f95a9960e03149d27d935da25b768878feb3e /include/asm-arm/arch-s3c2410 | |
| parent | e9d52234e35b27ea4ea5f2ab64ca47b1a0c740ab (diff) | |
| parent | 37d07b72ef58f2d5ec7701ab75084fbeee0e503e (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-s3c2410')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/memory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/arch-s3c2410/memory.h b/include/asm-arm/arch-s3c2410/memory.h index 3380ab1d0749..6ab834a14c8e 100644 --- a/include/asm-arm/arch-s3c2410/memory.h +++ b/include/asm-arm/arch-s3c2410/memory.h | |||
| @@ -28,9 +28,9 @@ | |||
| 28 | * and at 0x0C000000 for S3C2400 | 28 | * and at 0x0C000000 for S3C2400 |
| 29 | */ | 29 | */ |
| 30 | #ifdef CONFIG_CPU_S3C2400 | 30 | #ifdef CONFIG_CPU_S3C2400 |
| 31 | #define PHYS_OFFSET (0x0C000000UL) | 31 | #define PHYS_OFFSET UL(0x0C000000) |
| 32 | #else | 32 | #else |
| 33 | #define PHYS_OFFSET (0x30000000UL) | 33 | #define PHYS_OFFSET UL(0x30000000) |
| 34 | #endif | 34 | #endif |
| 35 | 35 | ||
| 36 | /* | 36 | /* |