From: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Date: Tue, 22 Apr 2008 00:49:34 +0000 (+1000)
Subject: [POWERPC] 4xx: Fix duplicate phys_addr_t definition
X-Git-Tag: MMI-PSA29.97-13-9~35525^2~34
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e91d7119ba8031f57cee5814e31c893487844011;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

[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>
---

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