git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'acpi-pad' into release
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-pxa
/
viper.c
diff --git
a/arch/arm/mach-pxa/viper.c
b/arch/arm/mach-pxa/viper.c
index 5352b4e5a7dda117cad09368339733f3fef9e106..89f258c9e126acf249f719a39a629946cc8ae024 100644
(file)
--- a/
arch/arm/mach-pxa/viper.c
+++ b/
arch/arm/mach-pxa/viper.c
@@
-379,7
+379,7
@@
err_request_bckl:
return ret;
}
-static int viper_backlight_notify(int brightness)
+static int viper_backlight_notify(
struct device *dev,
int brightness)
{
gpio_set_value(VIPER_LCD_EN_GPIO, !!brightness);
gpio_set_value(VIPER_BCKLIGHT_EN_GPIO, !!brightness);