diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-12-16 14:28:10 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-12-16 14:28:10 -0500 |
| commit | 2cb85a7bd2ca6db3ab3d632d0a1b6ca3770ddcf4 (patch) | |
| tree | 04857b183cef8996c7380ebc8a83b5110c71e15d /include/video | |
| parent | d7dde8c191d136415819e4456e21f2b0cc00c326 (diff) | |
| parent | d9ba573718666df2e7e30d671f81bba39d07f91c (diff) | |
Merge branch 'omap-for-v3.8/fixes-for-merge-window' into omap-for-v3.8/fixes-for-merge-window-v2
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/omap-panel-tfp410.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/video/omap-panel-tfp410.h b/include/video/omap-panel-tfp410.h index 68c31d79c571..aef35e48bc7e 100644 --- a/include/video/omap-panel-tfp410.h +++ b/include/video/omap-panel-tfp410.h | |||
| @@ -28,7 +28,7 @@ struct omap_dss_device; | |||
| 28 | * @power_down_gpio: gpio number for PD pin (or -1 if not available) | 28 | * @power_down_gpio: gpio number for PD pin (or -1 if not available) |
| 29 | */ | 29 | */ |
| 30 | struct tfp410_platform_data { | 30 | struct tfp410_platform_data { |
| 31 | u16 i2c_bus_num; | 31 | int i2c_bus_num; |
| 32 | int power_down_gpio; | 32 | int power_down_gpio; |
| 33 | }; | 33 | }; |
| 34 | 34 | ||