Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0de9a00f authored by Russell King's avatar Russell King
Browse files

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

parents 22325525 d13fecd0

arch/arm/mach-pxa/include/mach/hardware.h

+3 −6
Original line number Diff line number Diff line
@@ -250,20 +250,17 @@ 


#define cpu_is_pxa930()					\

	({						\

		unsigned int id = read_cpuid(CPUID_ID);	\

		__cpu_is_pxa930(id);			\

		__cpu_is_pxa930(read_cpuid_id());	\

	 })



#define cpu_is_pxa935()					\

	({						\

		unsigned int id = read_cpuid(CPUID_ID);	\

		__cpu_is_pxa935(id);			\

		__cpu_is_pxa935(read_cpuid_id());	\

	 })



#define cpu_is_pxa950()					\

	({						\

		unsigned int id = read_cpuid(CPUID_ID);	\

		__cpu_is_pxa950(id);			\

		__cpu_is_pxa950(read_cpuid_id());	\

	 })

arch/arm/mach-pxa/magician.c

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static int magician_backlight_init(struct device *dev) 
	return ret;

}



static int magician_backlight_notify(int brightness)

static int magician_backlight_notify(struct device *dev, int brightness)

{

	gpio_set_value(EGPIO_MAGICIAN_BL_POWER, brightness);

	if (brightness >= 200) {

arch/arm/mach-pxa/palmld.c

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static int palmld_backlight_init(struct device *dev) 
	return ret;

}



static int palmld_backlight_notify(int brightness)

static int palmld_backlight_notify(struct device *dev, int brightness)

{

	gpio_set_value(GPIO_NR_PALMLD_BL_POWER, brightness);

	gpio_set_value(GPIO_NR_PALMLD_LCD_POWER, brightness);

arch/arm/mach-pxa/palmt5.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static int palmt5_backlight_init(struct device *dev) 
	return ret;

}



static int palmt5_backlight_notify(int brightness)

static int palmt5_backlight_notify(struct device *dev, int brightness)

{

	gpio_set_value(GPIO_NR_PALMT5_BL_POWER, brightness);

	gpio_set_value(GPIO_NR_PALMT5_LCD_POWER, brightness);

arch/arm/mach-pxa/palmtc.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static int palmtc_backlight_init(struct device *dev) 
	return ret;

}



static int palmtc_backlight_notify(int brightness)

static int palmtc_backlight_notify(struct device *dev, int brightness)

{

	/* backlight is on when GPIO16 AF0 is high */

	gpio_set_value(GPIO_NR_PALMTC_BL_POWER, brightness);