Merge branch 'devel-stable' into devel

This commit is contained in:
Russell King 2009-12-05 10:35:33 +00:00
commit 0719dc3413
337 changed files with 16393 additions and 3369 deletions

View file

@ -96,6 +96,10 @@ struct da9034_touch_pdata {
int y_inverted;
};
struct da9034_backlight_pdata {
int output_current; /* output current of WLED, from 0-31 (in mA) */
};
/* DA9030 battery charger data */
struct power_supply_info;