diff options
author | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2008-04-21 20:49:34 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-04-24 06:57:34 -0400 |
commit | e91d7119ba8031f57cee5814e31c893487844011 (patch) | |
tree | e47217a309777aeea1e4281347ccad9cc28fa988 /include | |
parent | df40a57ef16219e5dee75238559960b1dd459c65 (diff) |
[POWERPC] 4xx: Fix duplicate phys_addr_t definition
Commit d04ceb3fc294ea2c4f538a04343f3a473953a3b0 moved phys_addr_t
definitions to include/asm-powerpc/types.h. However, arch/ppc 440
builds had a duplicate definition in include/asm-ppc/mmu.h that caused
the build to fail.
This removes the duplicate definition in arch/ppc.
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-ppc/mmu.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-ppc/mmu.h b/include/asm-ppc/mmu.h index d46b57b589ae..d76ef098ed37 100644 --- a/include/asm-ppc/mmu.h +++ b/include/asm-ppc/mmu.h | |||
@@ -15,10 +15,8 @@ | |||
15 | * physical need a larger than native word size type. -Matt | 15 | * physical need a larger than native word size type. -Matt |
16 | */ | 16 | */ |
17 | #ifndef CONFIG_PHYS_64BIT | 17 | #ifndef CONFIG_PHYS_64BIT |
18 | typedef unsigned long phys_addr_t; | ||
19 | #define PHYS_FMT "%.8lx" | 18 | #define PHYS_FMT "%.8lx" |
20 | #else | 19 | #else |
21 | typedef unsigned long long phys_addr_t; | ||
22 | extern phys_addr_t fixup_bigphys_addr(phys_addr_t, phys_addr_t); | 20 | extern phys_addr_t fixup_bigphys_addr(phys_addr_t, phys_addr_t); |
23 | #define PHYS_FMT "%16Lx" | 21 | #define PHYS_FMT "%16Lx" |
24 | #endif | 22 | #endif |