Update of /cvsroot/gc-linux/linux/arch/ppc/platforms
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26340/arch/ppc/platforms
Modified Files:
gamecube.c
Log Message:
Merged 2.6.18.
Index: gamecube.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- gamecube.c 31 May 2006 17:49:30 -0000 1.36
+++ gamecube.c 17 Feb 2007 23:43:40 -0000 1.37
@@ -11,8 +11,8 @@
*
*/
+#include <linux/kernel.h>
#include <linux/init.h>
-#include <linux/config.h>
#include <linux/irq.h>
#include <linux/initrd.h>
#include <linux/seq_file.h>
@@ -149,7 +149,7 @@
writel(0xffffffff, FLIPPER_ICR);
for (i = 0; i < FLIPPER_NR_IRQS; i++)
- irq_desc[i].handler = &flipper_pic;
+ irq_desc[i].chip = &flipper_pic;
}
static int gamecube_show_cpuinfo(struct seq_file *m)
|
