diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-01-14 08:12:37 -0500 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-01-14 08:12:37 -0500 |
| commit | 0134e89c7bcc9fde1da962c82a120691e185619f (patch) | |
| tree | 3e03335cf001019a2687d161e956de4f73379984 /include/linux/pwm_backlight.h | |
| parent | c7066f70d9610df0b9406cc635fc09e86136e714 (diff) | |
| parent | 6faee60a4e82075853a437831768cc9e2e563e4e (diff) | |
Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6
Conflicts:
net/ipv4/route.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/linux/pwm_backlight.h')
| -rw-r--r-- | include/linux/pwm_backlight.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pwm_backlight.h b/include/linux/pwm_backlight.h index 01b3d759f1fc..e031e1a486d9 100644 --- a/include/linux/pwm_backlight.h +++ b/include/linux/pwm_backlight.h | |||
| @@ -8,6 +8,7 @@ struct platform_pwm_backlight_data { | |||
| 8 | int pwm_id; | 8 | int pwm_id; |
| 9 | unsigned int max_brightness; | 9 | unsigned int max_brightness; |
| 10 | unsigned int dft_brightness; | 10 | unsigned int dft_brightness; |
| 11 | unsigned int lth_brightness; | ||
| 11 | unsigned int pwm_period_ns; | 12 | unsigned int pwm_period_ns; |
| 12 | int (*init)(struct device *dev); | 13 | int (*init)(struct device *dev); |
| 13 | int (*notify)(struct device *dev, int brightness); | 14 | int (*notify)(struct device *dev, int brightness); |