aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-21 17:33:23 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-21 17:33:23 -0800
commit298a4c3a57fed38df365a6807728d1930a72c728 (patch)
treef8836c6a0be6b4810221fa801378b752b41a476c
parent92dcffb916d309aa01778bf8963a6932e4014d07 (diff)
parent1619ce111492d733d425acbacec9a2cb2ba16ed9 (diff)
Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux
* 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux: hmt: adjust for new pwm_backlight->notify prototype
-rw-r--r--arch/arm/mach-s3c6410/mach-hmt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c6410/mach-hmt.c b/arch/arm/mach-s3c6410/mach-hmt.c
index cdd4b537855..7619456f2ae 100644
--- a/arch/arm/mach-s3c6410/mach-hmt.c
+++ b/arch/arm/mach-s3c6410/mach-hmt.c
@@ -82,7 +82,7 @@ static int hmt_bl_init(struct device *dev)
return ret;
}
-static int hmt_bl_notify(int brightness)
+static int hmt_bl_notify(struct device *dev, int brightness)
{
/*
* translate from CIELUV/CIELAB L*->brightness, E.G. from