diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-25 23:55:54 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-25 23:55:54 +0100 |
| commit | 18bbff9f679cd470db66402fdb9c577b34324183 (patch) | |
| tree | f8e90adadfde630368034268de8cc5763898ab37 /arch/arm/mach-sa1100/generic.c | |
| parent | Merge branch 'sa11x0-mtd' into sa11x0 (diff) | |
| parent | FB: sa11x0: convert to use platform resource and ioremap() (diff) | |
| download | wireguard-linux-18bbff9f679cd470db66402fdb9c577b34324183.tar.xz wireguard-linux-18bbff9f679cd470db66402fdb9c577b34324183.zip | |
Merge branch 'sa11x0-lcd' into sa11x0
Conflicts:
arch/arm/mach-sa1100/assabet.c
Diffstat (limited to 'arch/arm/mach-sa1100/generic.c')
| -rw-r--r-- | arch/arm/mach-sa1100/generic.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c index 01a20ea35b53..0296d69622ac 100644 --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c @@ -20,6 +20,8 @@ #include <linux/ioport.h> #include <linux/platform_device.h> +#include <video/sa1100fb.h> + #include <asm/div64.h> #include <mach/hardware.h> #include <asm/system.h> @@ -247,6 +249,11 @@ static struct platform_device sa11x0fb_device = { .resource = sa11x0fb_resources, }; +void sa11x0_register_lcd(struct sa1100fb_mach_info *inf) +{ + sa11x0_register_device(&sa11x0fb_device, inf); +} + static struct platform_device sa11x0pcmcia_device = { .name = "sa11x0-pcmcia", .id = -1, @@ -319,7 +326,6 @@ static struct platform_device *sa11x0_devices[] __initdata = { &sa11x0uart3_device, &sa11x0ssp_device, &sa11x0pcmcia_device, - &sa11x0fb_device, &sa11x0rtc_device, &sa11x0dma_device, }; @@ -332,12 +338,6 @@ static int __init sa1100_init(void) arch_initcall(sa1100_init); -void (*sa1100fb_backlight_power)(int on); -void (*sa1100fb_lcd_power)(int on); - -EXPORT_SYMBOL(sa1100fb_backlight_power); -EXPORT_SYMBOL(sa1100fb_lcd_power); - /* * Common I/O mapping: |