[POWERPC] 4xx: Fix duplicate phys_addr_t definition
authorJosh Boyer <jwboyer@linux.vnet.ibm.com>
Tue, 22 Apr 2008 00:49:34 +0000 (10:49 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 24 Apr 2008 10:57:34 +0000 (20:57 +1000)
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>
include/asm-ppc/mmu.h

index d46b57b589ae75334c041af4d4bac4f9f15990cb..d76ef098ed37efc613dbf87276d3d9b29a13ca49 100644 (file)
  * 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