omapfb: fix build for n770

omapfb: fix build for n770

[Arnaud Patard]

[-- Attachment #1: Type: text/plain, Size: 521 bytes --]

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>
---

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: fix_n800fb_breakage.patch --]
[-- Type: text/x-diff, Size: 1437 bytes --]

---
 drivers/video/omap/sossi.c       |    3 	2 +	1 -	0 !
 include/asm-arm/arch-omap/irqs.h |    1 	1 +	0 -	0 !
 2 files changed, 3 insertions(+), 1 deletion(-)

Index: linux-omap-2.6/include/asm-arm/arch-omap/irqs.h
===================================================================
--- linux-omap-2.6.orig/include/asm-arm/arch-omap/irqs.h	2007-02-16 09:37:44.000000000 +0100
+++ linux-omap-2.6/include/asm-arm/arch-omap/irqs.h	2007-02-16 11:01:42.000000000 +0100
@@ -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)
Index: linux-omap-2.6/drivers/video/omap/sossi.c
===================================================================
--- linux-omap-2.6.orig/drivers/video/omap/sossi.c	2007-02-16 09:45:32.000000000 +0100
+++ linux-omap-2.6/drivers/video/omap/sossi.c	2007-02-16 09:52:09.000000000 +0100
@@ -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,

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: omapfb: fix build for n770

[Tony Lindgren]

* Arnaud Patard <arnaud.patard@rtp-net.org> [070216 02:20]:
> 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 ]

Pushing today.

Tony