Merge foobazco.org:/sources/2.5-bk

into foobazco.org:/sources/2.5-sparc-smp

diff --cc arch/sparc/kernel/setup.c
index 152855146d117714e8f89c3d445014a4104067d5,c1e9182eb893e790946f5b36cddf31e4b57ba1e6..b4e4e9ffd7ea1ce9ccf7a3132e066651f68a9a85
--- 1/arch/sparc/kernel/setup.c
--- 2/arch/sparc/kernel/setup.c
+++ b/arch/sparc/kernel/setup.c
@@@ -389,8 -391,13 +390,8 @@@ static int __init set_preferred_console
  }
  console_initcall(set_preferred_console);
  
- extern char *sparc_cpu_type[];
- extern char *sparc_fpu_type[];
 -asmlinkage int sys_ioperm(unsigned long from, unsigned long num, int on)
 -{
 -      return -EIO;
 -}
 -
+ extern char *sparc_cpu_type;
+ extern char *sparc_fpu_type;
  
  static int show_cpuinfo(struct seq_file *m, void *__unused)
  {

diff --cc arch/sparc/mm/srmmu.c
Simple merge