From f8f81417d3d1021f48952b9b93f8aa73223550ab Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Sat, 19 Apr 2008 19:57:33 +1000 Subject: [PATCH] --- yaml --- r: 93475 b: refs/heads/master c: acb0142bf01c0ebe18f09e37814451ee6a873e27 h: refs/heads/master i: 93473: c96fe58356f50c239798a128a4d3f528ec40bf6c 93471: 1e87f011f2d0f63bb2be9b0a221d3ed43f39a425 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/cpu_setup_44x.S | 1 - trunk/arch/powerpc/kernel/cputable.c | 4 +--- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a5b57fad3b08..8cc0b6cca023 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5020231bf73a30a7d9244f1675002fffcdc10ceb +refs/heads/master: acb0142bf01c0ebe18f09e37814451ee6a873e27 diff --git a/trunk/arch/powerpc/kernel/cpu_setup_44x.S b/trunk/arch/powerpc/kernel/cpu_setup_44x.S index 5465e8de0e61..e3623e3e3451 100644 --- a/trunk/arch/powerpc/kernel/cpu_setup_44x.S +++ b/trunk/arch/powerpc/kernel/cpu_setup_44x.S @@ -33,7 +33,6 @@ _GLOBAL(__setup_cpu_440grx) mtlr r4 blr _GLOBAL(__setup_cpu_460ex) -_GLOBAL(__setup_cpu_460gt) b __init_fpu_44x _GLOBAL(__setup_cpu_440gx) _GLOBAL(__setup_cpu_440spe) diff --git a/trunk/arch/powerpc/kernel/cputable.c b/trunk/arch/powerpc/kernel/cputable.c index 26ffb44e2701..36080d4d1922 100644 --- a/trunk/arch/powerpc/kernel/cputable.c +++ b/trunk/arch/powerpc/kernel/cputable.c @@ -37,7 +37,6 @@ extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec); extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec); extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec); extern void __setup_cpu_460ex(unsigned long offset, struct cpu_spec* spec); -extern void __setup_cpu_460gt(unsigned long offset, struct cpu_spec* spec); extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec); extern void __setup_cpu_604(unsigned long offset, struct cpu_spec* spec); extern void __setup_cpu_750(unsigned long offset, struct cpu_spec* spec); @@ -1416,10 +1415,9 @@ static struct cpu_spec __initdata cpu_specs[] = { .pvr_value = 0x13020000, .cpu_name = "460GT", .cpu_features = CPU_FTRS_44X, - .cpu_user_features = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU, + .cpu_user_features = COMMON_USER_BOOKE, .icache_bsize = 32, .dcache_bsize = 32, - .cpu_setup = __setup_cpu_460gt, .machine_check = machine_check_440A, .platform = "ppc440", },