Merge branch 'devel-stable' into devel

2 files changed, 4 insertions, 2 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 {
         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;
 
diff --git a/include/video/pxa168fb.h b/include/video/pxa168fb.h
index b5cc72fe0461..8c2f385a90ea 100644
--- a/include/video/pxa168fb.h
+++ b/include/video/pxa168fb.h
@@ -117,8 +117,6 @@ struct pxa168fb_mach_info {
         unsigned        invert_composite_blank:1;
         unsigned        invert_pix_val_ena:1;
         unsigned        invert_pixclock:1;
-        unsigned        invert_vsync:1;
-        unsigned        invert_hsync:1;
         unsigned        panel_rbswap:1;
         unsigned        active:1;
         unsigned        enable_lcd:1;