diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 17:33:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 17:33:23 -0800 |
| commit | 298a4c3a57fed38df365a6807728d1930a72c728 (patch) | |
| tree | f8836c6a0be6b4810221fa801378b752b41a476c /arch | |
| parent | Linux 2.6.33-rc5 (diff) | |
| parent | hmt: adjust for new pwm_backlight->notify prototype (diff) | |
| download | linux-dev-298a4c3a57fed38df365a6807728d1930a72c728.tar.xz linux-dev-298a4c3a57fed38df365a6807728d1930a72c728.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s3c6410/mach-hmt.c | 2 |
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 cdd4b5378552..7619456f2ae8 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 |