Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable

2009-12-04 17:34:16 +00:00
parent 602fd7c367 19d6c13b56
commit 4567c4a896
89 changed files with 3101 additions and 1114 deletions
@@ -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;