diff --git a/[refs] b/[refs] index 207196b58759..1f9e0f8eb0c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df40a57ef16219e5dee75238559960b1dd459c65 +refs/heads/master: e91d7119ba8031f57cee5814e31c893487844011 diff --git a/trunk/include/asm-ppc/mmu.h b/trunk/include/asm-ppc/mmu.h index d46b57b589ae..d76ef098ed37 100644 --- a/trunk/include/asm-ppc/mmu.h +++ b/trunk/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