diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-06-12 07:00:35 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-06-12 07:00:35 -0700 |
| commit | f445d05328a2d627c2fb70c79d8b01455c254609 (patch) | |
| tree | e46c5f112ba429f836c0c63719b928a8e14fb131 /include/linux/platform_data | |
| parent | 668468b161745df666b75fbfb76d14155b0f9df6 (diff) | |
| parent | 3d85f548d3c84a13dc54cc9c79249c5fdae2ad36 (diff) | |
Merge branch 'dss-regulator' into omap-for-v3.11/fixes-non-critical
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/clk-lpss.h | 5 | ||||
| -rw-r--r-- | include/linux/platform_data/serial-omap.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/platform_data/clk-lpss.h b/include/linux/platform_data/clk-lpss.h index 528e73ce46d2..23901992b9dd 100644 --- a/include/linux/platform_data/clk-lpss.h +++ b/include/linux/platform_data/clk-lpss.h @@ -13,6 +13,11 @@ #ifndef __CLK_LPSS_H #define __CLK_LPSS_H +struct lpss_clk_data { + const char *name; + struct clk *clk; +}; + extern int lpt_clk_init(void); #endif /* __CLK_LPSS_H */ diff --git a/include/linux/platform_data/serial-omap.h b/include/linux/platform_data/serial-omap.h index ff9b0aab5281..c860c1b314c0 100644 --- a/include/linux/platform_data/serial-omap.h +++ b/include/linux/platform_data/serial-omap.h @@ -43,8 +43,6 @@ struct omap_uart_port_info { int DTR_present; int (*get_context_loss_count)(struct device *); - void (*set_forceidle)(struct device *); - void (*set_noidle)(struct device *); void (*enable_wakeup)(struct device *, bool); }; |