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-h720x/memory.h | |
parent | e9d52234e35b27ea4ea5f2ab64ca47b1a0c740ab (diff) | |
parent | 37d07b72ef58f2d5ec7701ab75084fbeee0e503e (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-h720x/memory.h')
-rw-r--r-- | include/asm-arm/arch-h720x/memory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-h720x/memory.h b/include/asm-arm/arch-h720x/memory.h index 5633447af268..4a1bfd78a0fe 100644 --- a/include/asm-arm/arch-h720x/memory.h +++ b/include/asm-arm/arch-h720x/memory.h | |||
@@ -11,7 +11,7 @@ | |||
11 | * Page offset: | 11 | * Page offset: |
12 | * ( 0xc0000000UL ) | 12 | * ( 0xc0000000UL ) |
13 | */ | 13 | */ |
14 | #define PHYS_OFFSET (0x40000000UL) | 14 | #define PHYS_OFFSET UL(0x40000000) |
15 | 15 | ||
16 | /* | 16 | /* |
17 | * Virtual view <-> DMA view memory address translations | 17 | * Virtual view <-> DMA view memory address translations |