diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-14 06:50:04 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-21 06:56:19 -0500 |
commit | e1b7a72aeb8292502c97b43eceb01aea47ded40f (patch) | |
tree | e3932a7b52a5805cfff785ca9162925e34eb3095 /arch/arm/mach-sa1100/generic.c | |
parent | 9e6720fb0cfd6edda12b408a66f4ac88e8a82e32 (diff) |
FB: sa1100: move platform data to platform files
Move platform data out of the sa1100fb driver into the various
platform files themselves.
Acked-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100/generic.c')
-rw-r--r-- | arch/arm/mach-sa1100/generic.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c index bb10ee2cb89f..f57808fb1827 100644 --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c | |||
@@ -19,6 +19,8 @@ | |||
19 | #include <linux/ioport.h> | 19 | #include <linux/ioport.h> |
20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
21 | 21 | ||
22 | #include <video/sa1100fb.h> | ||
23 | |||
22 | #include <asm/div64.h> | 24 | #include <asm/div64.h> |
23 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |
24 | #include <asm/system.h> | 26 | #include <asm/system.h> |
@@ -294,6 +296,11 @@ static struct platform_device sa11x0fb_device = { | |||
294 | .resource = sa11x0fb_resources, | 296 | .resource = sa11x0fb_resources, |
295 | }; | 297 | }; |
296 | 298 | ||
299 | void sa11x0_register_lcd(struct sa1100fb_mach_info *inf) | ||
300 | { | ||
301 | sa11x0_register_device(&sa11x0fb_device, inf); | ||
302 | } | ||
303 | |||
297 | static struct platform_device sa11x0pcmcia_device = { | 304 | static struct platform_device sa11x0pcmcia_device = { |
298 | .name = "sa11x0-pcmcia", | 305 | .name = "sa11x0-pcmcia", |
299 | .id = -1, | 306 | .id = -1, |
@@ -356,7 +363,6 @@ static struct platform_device *sa11x0_devices[] __initdata = { | |||
356 | &sa11x0uart3_device, | 363 | &sa11x0uart3_device, |
357 | &sa11x0ssp_device, | 364 | &sa11x0ssp_device, |
358 | &sa11x0pcmcia_device, | 365 | &sa11x0pcmcia_device, |
359 | &sa11x0fb_device, | ||
360 | &sa11x0rtc_device, | 366 | &sa11x0rtc_device, |
361 | }; | 367 | }; |
362 | 368 | ||