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.h | |
| parent | e7d863d0f42e2cf19a13c867bfcab7424388bff8 (diff) | |
| parent | 7cb66dcc828662c8cacb74af08478433cef102b1 (diff) | |
Merge branch 'sa11x0-lcd' into sa11x0
Conflicts:
arch/arm/mach-sa1100/assabet.c
Diffstat (limited to 'arch/arm/mach-sa1100/generic.h')
| -rw-r--r-- | arch/arm/mach-sa1100/generic.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-sa1100/generic.h b/arch/arm/mach-sa1100/generic.h index 33268cf6be36..5c68be858e0c 100644 --- a/arch/arm/mach-sa1100/generic.h +++ b/arch/arm/mach-sa1100/generic.h @@ -16,9 +16,6 @@ extern void sa11x0_restart(char, const char *); mi->bank[__nr].start = (__start), \ mi->bank[__nr].size = (__size) -extern void (*sa1100fb_backlight_power)(int on); -extern void (*sa1100fb_lcd_power)(int on); - extern void sa1110_mb_enable(void); extern void sa1110_mb_disable(void); @@ -40,3 +37,6 @@ void sa11x0_register_irda(struct irda_platform_data *irda); struct mcp_plat_data; void sa11x0_register_mcp(struct mcp_plat_data *data); + +struct sa1100fb_mach_info; +void sa11x0_register_lcd(struct sa1100fb_mach_info *inf); |