[Gc-linux-cvs] linux/arch/ppc/platforms gamecube.c, 1.37, 1.38 gcn-rsw.c, 1.3, 1.4

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/ppc/platforms
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22637/arch/ppc/platforms

Modified Files:
	gamecube.c gcn-rsw.c 
Log Message:
Merged 2.6.19.


Index: gamecube.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- gamecube.c	17 Feb 2007 23:43:40 -0000	1.37
+++ gamecube.c	18 Feb 2007 22:56:01 -0000	1.38
@@ -95,7 +95,7 @@
 	tb_to_us = mulhwu_scale_factor(freq/divisor, 1000000);
 }
 
-static int gamecube_get_irq(struct pt_regs *regs)
+static int gamecube_get_irq(void)
 {
 	int irq;
 	u32 irq_status;

Index: gcn-rsw.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gcn-rsw.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gcn-rsw.c	24 Feb 2005 21:36:41 -0000	1.3
+++ gcn-rsw.c	18 Feb 2007 22:56:01 -0000	1.4
@@ -94,8 +94,7 @@
 /**
  *
  */
-static irqreturn_t gcn_rsw_handler(int this_irq, void *data,
-				     struct pt_regs *regs)
+static irqreturn_t gcn_rsw_handler(int this_irq, void *data)
 {
 	struct gcn_rsw_private *priv = (struct gcn_rsw_private *)data;
 	unsigned long flags;