summaryrefslogtreecommitdiffstats
path: root/drivers/video/sa1100fb.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-14 05:56:06 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-21 06:56:19 -0500
commit9e6720fb0cfd6edda12b408a66f4ac88e8a82e32 (patch)
tree5f4cbef29c20e546da77aa4bc50283cf445d75dc /drivers/video/sa1100fb.c
parent531060fc1989a438fbc2c3198f5057c40121ff50 (diff)
FB: sa1100: move machine inf structures to <video/sa1100fb.h>
Move the LCD data structures to an include file which can be shared with the board code in arch/arm/mach-sa1100. Acked-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/video/sa1100fb.c')
-rw-r--r--drivers/video/sa1100fb.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index a905e20404fd..8f5557a12ff8 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -178,6 +178,8 @@
178#include <linux/mutex.h> 178#include <linux/mutex.h>
179#include <linux/io.h> 179#include <linux/io.h>
180 180
181#include <video/sa1100fb.h>
182
181#include <mach/hardware.h> 183#include <mach/hardware.h>
182#include <asm/mach-types.h> 184#include <asm/mach-types.h>
183#include <mach/assabet.h> 185#include <mach/assabet.h>
@@ -1388,7 +1390,9 @@ static struct sa1100fb_info * __devinit sa1100fb_init_fbinfo(struct device *dev)
1388 fbi->rgb[RGB_8] = &rgb_8; 1390 fbi->rgb[RGB_8] = &rgb_8;
1389 fbi->rgb[RGB_16] = &def_rgb_16; 1391 fbi->rgb[RGB_16] = &def_rgb_16;
1390 1392
1391 inf = sa1100fb_get_machine_info(fbi); 1393 inf = dev->platform_data;
1394 if (!inf)
1395 inf = sa1100fb_get_machine_info(fbi);
1392 1396
1393 /* 1397 /*
1394 * People just don't seem to get this. We don't support 1398 * People just don't seem to get this. We don't support