Automerge with /usr/src/ntfs-2.6.git.

1 files changed, 11 insertions, 0 deletions

diff --git a/arch/ppc64/kernel/cputable.c b/arch/ppc64/kernel/cputable.c
index 8644a8648058..1d162c7c59df 100644
--- a/arch/ppc64/kernel/cputable.c
+++ b/arch/ppc64/kernel/cputable.c
@@ -34,6 +34,7 @@ EXPORT_SYMBOL(cur_cpu_spec);
 extern void __setup_cpu_power3(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_power4(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_ppc970(unsigned long offset, struct cpu_spec* spec);
+extern void __setup_cpu_be(unsigned long offset, struct cpu_spec* spec);
 
 
 /* We only set the altivec features if the kernel was compiled with altivec
@@ -162,6 +163,16 @@ struct cpu_spec	cpu_specs[] = {
             __setup_cpu_power4,
             COMMON_PPC64_FW
     },
+    {   /* BE DD1.x  */
+            0xffff0000, 0x00700000, "Broadband Engine",
+            CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE |
+                    CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_ALTIVEC_COMP |
+                    CPU_FTR_SMT,
+            COMMON_USER_PPC64 | PPC_FEATURE_HAS_ALTIVEC_COMP,
+            128, 128,
+            __setup_cpu_be,
+            COMMON_PPC64_FW
+    },
     {   /* default match */
             0x00000000, 0x00000000, "POWER4 (compatible)",
             CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | CPU_FTR_HPTE_TABLE |