[Gc-linux-cvs] linux/arch/ppc/kernel cputable.c,1.5,1.6

[<aot...@us...>]

Update of /cvsroot/gc-linux/linux/arch/ppc/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24768/arch/ppc/kernel

Modified Files:
	cputable.c 
Log Message:
Merge 2.6.10

Index: cputable.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/kernel/cputable.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cputable.c	19 Nov 2004 01:10:59 -0000	1.5
+++ cputable.c	4 Jan 2005 21:39:06 -0000	1.6
@@ -30,7 +30,6 @@
 extern void __setup_cpu_power3(unsigned long offset, int cpu_nr, struct cpu_spec* spec);
 extern void __setup_cpu_power4(unsigned long offset, int cpu_nr, struct cpu_spec* spec);
 extern void __setup_cpu_ppc970(unsigned long offset, int cpu_nr, struct cpu_spec* spec);
-extern void __setup_cpu_8xx(unsigned long offset, int cpu_nr, struct cpu_spec* spec);
 extern void __setup_cpu_generic(unsigned long offset, int cpu_nr, struct cpu_spec* spec);
 
 #define CLASSIC_PPC (!defined(CONFIG_8xx) && !defined(CONFIG_4xx) && \
@@ -48,12 +47,21 @@
  */
 #ifdef CONFIG_ALTIVEC
 #define CPU_FTR_ALTIVEC_COMP		CPU_FTR_ALTIVEC
[...1379 lines suppressed...]
 #endif
 #if !CLASSIC_PPC
-    {	/* default match */
-    	0x00000000, 0x00000000, "(generic PPC)",
-	CPU_FTR_COMMON,
-    	PPC_FEATURE_32,
-	32, 32,
-	0,
-    }
+	{	/* default match */
+		.pvr_mask		= 0x00000000,
+		.pvr_value		= 0x00000000,
+		.cpu_name		= "(generic PPC)",
+		.cpu_features		= CPU_FTR_COMMON,
+		.cpu_user_features	= PPC_FEATURE_32,
+		.icache_bsize		= 32,
+		.dcache_bsize		= 32,
+	}
 #endif /* !CLASSIC_PPC */
 };