From: Imre Deak <imre.deak@solidboot.com>
Date: Tue, 6 Mar 2007 16:27:16 +0000 (+0200)
Subject: ARM: OMAP1: SoSSI: update IRQ name and callback table name
X-Git-Tag: v2.6.21-omap1~69^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ef994e10e63cae1058032a6e84143162f46668c8;p=linux-2.6-omap-h63xx.git

ARM: OMAP1: SoSSI: update IRQ name and callback table name

These were changed in the generic FB code, but not updated for the OMAP1
specific parts.

Signed-off-by: Imre Deak <imre.deak@solidboot.com>
---

diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c
index 71467b30348..505b93276ff 100644
--- a/drivers/video/omap/sossi.c
+++ b/drivers/video/omap/sossi.c
@@ -23,6 +23,7 @@
 #include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/clk.h>
+#include <linux/irq.h>
 
 #include <asm/io.h>
 
@@ -640,7 +641,8 @@ static int sossi_init(struct omapfb_device *fbdev)
 	l &= ~(1 << 31); /* REORDERING */
 	sossi_write_reg(SOSSI_INIT1_REG, l);
 
-	if ((r = request_irq(INT_SOSSI_MATCH, sossi_match_irq, IRQT_FALLING,
+	if ((r = request_irq(INT_1610_SoSSI_MATCH, sossi_match_irq,
+			     IRQT_FALLING,
 	     "sossi_match", sossi.fbdev->dev)) < 0) {
 		dev_err(sossi.fbdev->dev, "can't get SoSSI match IRQ\n");
 		goto err;
@@ -661,7 +663,7 @@ static void sossi_cleanup(void)
 	clk_put(sossi.fck);
 }
 
-struct lcd_ctrl_extif sossi_extif = {
+struct lcd_ctrl_extif omap1_ext_if = {
 	.init			= sossi_init,
 	.cleanup		= sossi_cleanup,
 	.get_clk_info		= sossi_get_clk_info,