summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/magician.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-01-08 16:18:37 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-01-08 16:18:37 +0000
commit0de9a00fd6e0a137c63fbbfb6012bf34cc0ab7c4 (patch)
treebda182d9407e32354620e9188258c86cad2e3813 /arch/arm/mach-pxa/magician.c
parent22325525d8bb1478daddefec1b762e7882bcd515 (diff)
parentd13fecd0293d55a4bcb8a31078216504192d8ce0 (diff)
downloadblackbird-op-linux-0de9a00fd6e0a137c63fbbfb6012bf34cc0ab7c4.tar.gz
blackbird-op-linux-0de9a00fd6e0a137c63fbbfb6012bf34cc0ab7c4.zip
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/magician.c')
-rw-r--r--arch/arm/mach-pxa/magician.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index 8a38d604dc77..189f330719a2 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -381,7 +381,7 @@ err:
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) {
OpenPOWER on IntegriCloud