diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 23:58:07 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 23:58:07 (GMT) |
| commit | 4e46aa083853a84c770e00b03746bdeaf5c5aeff (patch) | |
| tree | f93d3f88e038d176a4661639edbdb9a99d9f7402 /include/linux/pwm_backlight.h | |
| parent | 9209e4bd4b3b9ee3a104313b426380e8d1f59260 (diff) | |
| parent | f7a297af49e5d9d2c577466307e8ef392750c9d9 (diff) | |
| download | linux-fsl-qoriq-4e46aa083853a84c770e00b03746bdeaf5c5aeff.tar.xz | |
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
backlight: mbp_nvidia_bl - add two more MacBookPro variants
backlight: Pass device through notify callback in the pwm driver
backlight: PTR_ERR return of wrong pointer in cr_backlight_probe()
backlight: Constify struct backlight_ops
backlight/thinkpad-acpi: issue backlight class events
Fix up trivial conflicts in thinkpad-acpi support (backlight support
already merged earlier).
Diffstat (limited to 'include/linux/pwm_backlight.h')
| -rw-r--r-- | include/linux/pwm_backlight.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pwm_backlight.h b/include/linux/pwm_backlight.h index 7a9754c..01b3d75 100644 --- a/include/linux/pwm_backlight.h +++ b/include/linux/pwm_backlight.h @@ -10,7 +10,7 @@ struct platform_pwm_backlight_data { unsigned int dft_brightness; unsigned int pwm_period_ns; int (*init)(struct device *dev); - int (*notify)(int brightness); + int (*notify)(struct device *dev, int brightness); void (*exit)(struct device *dev); }; |