Merge branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6

[linux-2.6] / include / asm-powerpc / mmu-44x.h

diff --git a/include/asm-powerpc/mmu-44x.h b/include/asm-powerpc/mmu-44x.h
index 62772ae839ca73728ca86df9085482c3594a53ec..a825524c981a3965bda27107e53e83b62e7b4c13 100644 (file)
--- a/include/asm-powerpc/mmu-44x.h
+++ b/include/asm-powerpc/mmu-44x.h
@@ -53,7 +53,7 @@
 
 #ifndef __ASSEMBLY__
 
-typedef unsigned long long phys_addr_t;
+extern unsigned int tlb_44x_hwater;
 
 typedef struct {
        unsigned long id;