From bb3ed6577c592d86f0976a92978c9454bbdfbe59 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Fri, 19 Oct 2007 02:01:23 +0400 Subject: [PATCH] tosa-tmio-lcd-r10.patch fixes --- arch/arm/mach-pxa/tosa_lcd.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-pxa/tosa_lcd.c b/arch/arm/mach-pxa/tosa_lcd.c index eeeee3e..d52f63f 100644 --- a/arch/arm/mach-pxa/tosa_lcd.c +++ b/arch/arm/mach-pxa/tosa_lcd.c @@ -66,7 +66,7 @@ static unsigned short normal_i2c[] = { }; I2C_CLIENT_INSMOD; -static struct corgibl_machinfo tosa_bl_machinfo = { +static struct generic_bl_info tosa_bl_machinfo = { .max_intensity = 255, .default_intensity = 68, .limit_mask = 0x0b, @@ -80,7 +80,8 @@ int tosa_bl_intensity(void) static void pxa_nssp_output(unsigned char reg, unsigned char data) { - unsigned long flag, dummy; + unsigned long flag; + u32 dummy; u32 dat = ( ((reg << 5) & 0xe0) | (data & 0x1f) ); spin_lock_irqsave(&tosa_nssp_lock, flag); -- 1.4.4.4