diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-02-02 23:10:39 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-02-02 23:10:39 +0100 |
| commit | e1a0bdd8022317e98650e70850de73eccfcde5ad (patch) | |
| tree | 462f63307118b95c8cbacee6954e4d09ee85b8d1 /include/video/da8xx-fb.h | |
| parent | 8127f4e883666c9960cfa89cffd36313748f8bab (diff) | |
| parent | 1a45dcfe2525e9432cb4aba461d4994fc2befe42 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/hid/hid-ids.h
Diffstat (limited to 'include/video/da8xx-fb.h')
| -rw-r--r-- | include/video/da8xx-fb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/video/da8xx-fb.h b/include/video/da8xx-fb.h index c051a50ed52..89d43b3d4cb 100644 --- a/include/video/da8xx-fb.h +++ b/include/video/da8xx-fb.h @@ -38,6 +38,7 @@ struct da8xx_lcdc_platform_data { const char manu_name[10]; void *controller_data; const char type[25]; + void (*panel_power_ctrl)(int); }; struct lcd_ctrl_config { |