diff options
| author | Olof Johansson <olof@lixom.net> | 2013-05-22 13:09:20 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-05-22 13:11:01 -0700 |
| commit | 25625c9334d3b6a9cd32d009b99b36f6a78616f3 (patch) | |
| tree | 03497342cf9b45da546cd9dd0f4b4434a1c0a697 /include | |
| parent | 8d9849b05154ff6f19f538c2d094ea0f32981bb0 (diff) | |
| parent | 3260c76055afc6c9396e5ad9f9e599505ea8891f (diff) | |
| download | linux-3.10-25625c9334d3b6a9cd32d009b99b36f6a78616f3.tar.gz linux-3.10-25625c9334d3b6a9cd32d009b99b36f6a78616f3.tar.bz2 linux-3.10-25625c9334d3b6a9cd32d009b99b36f6a78616f3.zip | |
Merge tag 'omap-fixes-a-for-3.10-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes
From Paul Walmsley:
Fix the OMAP serial driver to work correctly on OMAP4 when booting
with DT.
* tag 'omap-fixes-a-for-3.10-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending:
ARM: OMAP2+: hwmod: Remove sysc slave idle and auto idle apis
SERIAL: OMAP: Remove the slave idle handling from the driver
ARM: OMAP2+: serial: Remove the un-used slave idle hooks
ARM: OMAP2+: hwmod-data: UART IP needs software control to manage sidle modes
ARM: OMAP2+: hwmod: Add a new flag to handle SIDLE in SWSUP only in active
ARM: OMAP2+: hwmod: Fix sidle programming in _enable_sysc()/_idle_sysc()
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/platform_data/serial-omap.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/platform_data/serial-omap.h b/include/linux/platform_data/serial-omap.h index ff9b0aab528..c860c1b314c 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); }; |