Commit e91d7119 authored by Josh Boyer's avatar Josh Boyer Committed by Paul Mackerras

[POWERPC] 4xx: Fix duplicate phys_addr_t definition

Commit d04ceb3f 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: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent df40a57e
...@@ -15,10 +15,8 @@ ...@@ -15,10 +15,8 @@
* physical need a larger than native word size type. -Matt * physical need a larger than native word size type. -Matt
*/ */
#ifndef CONFIG_PHYS_64BIT #ifndef CONFIG_PHYS_64BIT
typedef unsigned long phys_addr_t;
#define PHYS_FMT "%.8lx" #define PHYS_FMT "%.8lx"
#else #else
typedef unsigned long long phys_addr_t;
extern phys_addr_t fixup_bigphys_addr(phys_addr_t, phys_addr_t); extern phys_addr_t fixup_bigphys_addr(phys_addr_t, phys_addr_t);
#define PHYS_FMT "%16Lx" #define PHYS_FMT "%16Lx"
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment