Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[~andy/linux] / include / asm-ppc / cputable.h

diff --git a/include/asm-ppc/cputable.h b/include/asm-ppc/cputable.h
index 22de04fe1b4c1942460e809e34a192a15304d0a8..41d8f8425c04e3312ab2f8eada4307f191810bc1 100644 (file)
--- a/include/asm-ppc/cputable.h
+++ b/include/asm-ppc/cputable.h
@@ -86,8 +86,9 @@ static inline unsigned int cpu_has_feature(unsigned int feature)
 #define CPU_FTR_DUAL_PLL_750FX         0x00004000
 #define CPU_FTR_NO_DPM                 0x00008000
 #define CPU_FTR_HAS_HIGH_BATS          0x00010000
-#define CPU_FTR_NEED_COHERENT           0x00020000
+#define CPU_FTR_NEED_COHERENT          0x00020000
 #define CPU_FTR_NO_BTIC                        0x00040000
+#define CPU_FTR_BIG_PHYS               0x00080000
 
 #ifdef __ASSEMBLY__