summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/palmtc.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-02-02 08:38:15 +0300
committerTejun Heo <tj@kernel.org>2010-02-02 08:38:15 +0300
commitab386128f20c44c458a90039ab1bdc265ac474c9 (patch)
tree2ad188744922b1bb951fd10ff50dc04c83acce22 /arch/arm/mach-pxa/palmtc.c
parentdbfc196a3cc1a2514ad0737a82f764de23bd65e6 (diff)
parentab658321f32770b903a4426e2a6fae0392757755 (diff)
downloadlinux-ab386128f20c44c458a90039ab1bdc265ac474c9.tar.xz
Merge branch 'master' into percpu
Diffstat (limited to 'arch/arm/mach-pxa/palmtc.c')
-rw-r--r--arch/arm/mach-pxa/palmtc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/palmtc.c b/arch/arm/mach-pxa/palmtc.c
index 308417592007..b992f07ece21 100644
--- a/arch/arm/mach-pxa/palmtc.c
+++ b/arch/arm/mach-pxa/palmtc.c
@@ -185,7 +185,7 @@ err:
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);