omapfb: fix build for n770

This patch fix the build breakage introduced by the n800 fb update. It
has not been tested but at least the kernel is building now.
The change from sossi_extif to omap1_ext_if has been suggested by the
os2007on770 project
(http://maemo.org/maemowiki/Os2007On770?highlight=%28os2007%29).

[ Checking that the n770 defconfig is still building after adding a n800
update would be nice. It's known that the n800 2.6.18 kernel has some
not-n770-friendly changes ]

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c
index 71467b30348eee3ef5109316778c244461baf97a..d4bb6393a749f40c270c9121b921ff67c6945785 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>
 
@@ -661,7 +662,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,

diff --git a/include/asm-arm/arch-omap/irqs.h b/include/asm-arm/arch-omap/irqs.h
index 3ede58b51db28f36688e451d173b51b1fffc12ab..08421cfdd5fbaa8a3d741058cfd48614a0d94903 100644 (file)
--- a/include/asm-arm/arch-omap/irqs.h
+++ b/include/asm-arm/arch-omap/irqs.h
@@ -125,6 +125,7 @@
 #define INT_UART2              (15 + IH2_BASE)
 #define INT_BT_MCSI1TX         (16 + IH2_BASE)
 #define INT_BT_MCSI1RX         (17 + IH2_BASE)
+#define INT_SOSSI_MATCH                (19 + IH2_BASE)
 #define INT_USB_W2FC           (20 + IH2_BASE)
 #define INT_1WIRE              (21 + IH2_BASE)
 #define INT_OS_TIMER           (22 + IH2_BASE)