From cd38564ecb2fc971e9d667efa5d168d8de81175f Mon Sep 17 00:00:00 2001 From: Michael Neuling Date: Tue, 23 Jan 2007 15:59:26 +1100 Subject: [PATCH] --- yaml --- r: 46815 b: refs/heads/master c: 1473ae6cab7f47dde4c14f397371b2ad94457d3a h: refs/heads/master i: 46813: 0cf926d82fa69d857cfd573774ea63af0f7098b6 46811: ad53d6c8d1a042765a23006320fe78b24d287021 46807: 4a3372c9194297dcd7eb7a51e900e8f50a4ea329 46799: c8ebe6eed812a8b0f2982c045f35d3ccb3e257c1 46783: eeba1f8b3e6f038507780bb86be6dc1aaad1cbfe v: v3 --- [refs] | 2 +- trunk/include/asm-powerpc/cputable.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 5ce45aab3fe1..50e9a5cc3557 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18a1e4c3ee67680287bf3c455b5047421eda3c14 +refs/heads/master: 1473ae6cab7f47dde4c14f397371b2ad94457d3a diff --git a/trunk/include/asm-powerpc/cputable.h b/trunk/include/asm-powerpc/cputable.h index 7384b8086b75..80e314d2f247 100644 --- a/trunk/include/asm-powerpc/cputable.h +++ b/trunk/include/asm-powerpc/cputable.h @@ -337,12 +337,6 @@ extern void do_feature_fixups(unsigned long value, void *fixup_start, CPU_FTR_COHERENT_ICACHE | CPU_FTR_LOCKLESS_TLBIE | \ CPU_FTR_PURR | CPU_FTR_SPURR | CPU_FTR_REAL_LE | \ CPU_FTR_DSCR) -#define CPU_FTRS_POWER6X (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \ - CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \ - CPU_FTR_MMCRA | CPU_FTR_SMT | \ - CPU_FTR_COHERENT_ICACHE | CPU_FTR_LOCKLESS_TLBIE | \ - CPU_FTR_PURR | CPU_FTR_CI_LARGE_PAGE | \ - CPU_FTR_SPURR | CPU_FTR_REAL_LE | CPU_FTR_DSCR) #define CPU_FTRS_CELL (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \ CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \ CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \