Merge branch 'omap-for-v3.8/fixes-for-merge-window' into omap-for-v3.8/fixes-for-merge-window-v2

2012-12-16 11:28:10 -08:00
parent d7dde8c191 d9ba573718
commit 2cb85a7bd2
24 changed files with 67 additions and 185 deletions
@@ -28,7 +28,7 @@ struct omap_dss_device;
 * @power_down_gpio: gpio number for PD pin (or -1 if not available)
 */
 struct tfp410_platform_data {
-	u16 i2c_bus_num;
+	int i2c_bus_num;
 	int power_down_gpio;
 };