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

[linux-2.6-omap-h63xx.git] / drivers / video / omap / sossi.c

diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c
index 71467b30348eee3ef5109316778c244461baf97a..505b93276ffd42ba3b6f43ddf7f18c5c29195d3f 100644 (file)
--- 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,