diff options
| author | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2008-04-22 02:49:34 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-24 12:57:34 +0200 |
| commit | e91d7119ba8031f57cee5814e31c893487844011 (patch) | |
| tree | e47217a309777aeea1e4281347ccad9cc28fa988 /include | |
| parent | [POWERPC] Fix mv64x60 early console code to use cell-index property (diff) | |
| download | linux-e91d7119ba8031f57cee5814e31c893487844011.tar.xz linux-e91d7119ba8031f57cee5814e31c893487844011.zip | |
[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 @@ * physical need a larger than native word size type. -Matt */ #ifndef CONFIG_PHYS_64BIT -typedef unsigned long phys_addr_t; #define PHYS_FMT "%.8lx" #else -typedef unsigned long long phys_addr_t; extern phys_addr_t fixup_bigphys_addr(phys_addr_t, phys_addr_t); #define PHYS_FMT "%16Lx" #endif |