From 249e1c0cb38cdad17cc528deecef501e7d0b18ea Mon Sep 17 00:00:00 2001
From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Wed, 12 Nov 2008 13:24:59 -0800
Subject: [PATCH] --- yaml --- r: 118900 b: refs/heads/master c:
 722faccc7eb0a9b248fba3e7020b1c3770c41aef h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/include/video/atmel_lcdc.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 589c4d4a65bf..bfb82614b9b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 468cc0320ed083e26364d9febde2679d981ed6a6
+refs/heads/master: 722faccc7eb0a9b248fba3e7020b1c3770c41aef
diff --git a/trunk/include/video/atmel_lcdc.h b/trunk/include/video/atmel_lcdc.h
index 6ad87f485992..0c864db1a466 100644
--- a/trunk/include/video/atmel_lcdc.h
+++ b/trunk/include/video/atmel_lcdc.h
@@ -38,7 +38,7 @@ struct atmel_lcdfb_info {
 	spinlock_t		lock;
 	struct fb_info		*info;
 	void __iomem		*mmio;
-	unsigned long		irq_base;
+	int			irq_base;
 	struct work_struct	task;
 
 	unsigned int		guard_time;