diff options
| author | Sean Paul <seanpaul@chromium.org> | 2017-06-20 18:50:41 +0300 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-06-20 18:50:41 +0300 |
| commit | b15cdca5b5de52dc2262c41917e8727b96b30fb0 (patch) | |
| tree | f61c45517b1763e40ebc1d2fbed3af906281ead5 /include/linux/platform_data | |
| parent | d4e0045c4ed300781d2d4cbab57d05ed5e665a37 (diff) | |
| parent | 8c52f36413063bedbb3d31a65048a61ea2f1e169 (diff) | |
| download | linux-b15cdca5b5de52dc2262c41917e8727b96b30fb0.tar.xz | |
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next-fixes
Backmerging airlied/drm-next
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/omapdss.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/platform_data/omapdss.h b/include/linux/platform_data/omapdss.h index 679177929045..7feb011ed500 100644 --- a/include/linux/platform_data/omapdss.h +++ b/include/linux/platform_data/omapdss.h @@ -27,7 +27,6 @@ enum omapdss_version { /* Board specific data */ struct omap_dss_board_info { - const char *default_display_name; int (*dsi_enable_pads)(int dsi_id, unsigned int lane_mask); void (*dsi_disable_pads)(int dsi_id, unsigned int lane_mask); int (*set_min_bus_tput)(struct device *dev, unsigned long r); |