diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 12:34:16 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 12:34:16 -0500 |
| commit | 4567c4a89693416ccca02d32109bce967e9c1ade (patch) | |
| tree | 9d77cf02ce269ed5fc4b6e2ebddb9ad7fd504ad1 /include/linux | |
| parent | 602fd7c36728a04e61a442c9755e7d454501266c (diff) | |
| parent | 19d6c13b56a78b3757e747f469285c2a546d634a (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/da903x.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/mfd/da903x.h b/include/linux/mfd/da903x.h index c63b65c94429..0aa3a1a49ee3 100644 --- a/include/linux/mfd/da903x.h +++ b/include/linux/mfd/da903x.h | |||
| @@ -96,6 +96,10 @@ struct da9034_touch_pdata { | |||
| 96 | int y_inverted; | 96 | int y_inverted; |
| 97 | }; | 97 | }; |
| 98 | 98 | ||
| 99 | struct da9034_backlight_pdata { | ||
| 100 | int output_current; /* output current of WLED, from 0-31 (in mA) */ | ||
| 101 | }; | ||
| 102 | |||
| 99 | /* DA9030 battery charger data */ | 103 | /* DA9030 battery charger data */ |
| 100 | struct power_supply_info; | 104 | struct power_supply_info; |
| 101 | 105 | ||