--- zzzz-none-000/linux-2.6.19.2/arch/mips/tx4938/toshiba_rbtx4938/spi_txx9.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/arch/mips/tx4938/toshiba_rbtx4938/spi_txx9.c	2007-01-11 07:38:19.000000000 +0000
@@ -36,18 +36,14 @@
 
 static DECLARE_WAIT_QUEUE_HEAD(txx9_spi_wait);
 
-static irqreturn_t txx9_spi_interrupt(int irq, void *dev_id)
+static void txx9_spi_interrupt(int irq, void *dev_id)
 {
 	/* disable rx intr */
 	tx4938_spiptr->cr0 &= ~TXx9_SPCR0_RBSIE;
 	wake_up(&txx9_spi_wait);
-
-	return IRQ_HANDLED;
 }
-
 static struct irqaction txx9_spi_action = {
-	.handler	= txx9_spi_interrupt,
-	.name		= "spi",
+	txx9_spi_interrupt, 0, 0, "spi", NULL, NULL,
 };
 
 void __init txx9_spi_irqinit(int irc_irq)