diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-03-06 16:37:49 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-03-06 16:37:49 -0800 |
| commit | dd713e97f7e08b5742d9252f404cde34b97e1587 (patch) | |
| tree | 96649970c8f2b52f274a7d80bfdaf1a7629e7890 /arch/arm/plat-omap/include | |
| parent | b01543dfe67bb1d191998e90d20534dc354de059 (diff) | |
| parent | 7cb034f8179dfc2889c1f2341566ee68f648a324 (diff) | |
Merge branch 'for_3.4/cleanup/uart' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into uart
Diffstat (limited to 'arch/arm/plat-omap/include')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/serial.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/serial.h b/arch/arm/plat-omap/include/plat/serial.h index 198d1e6a4a6..b073e5f2b19 100644 --- a/arch/arm/plat-omap/include/plat/serial.h +++ b/arch/arm/plat-omap/include/plat/serial.h @@ -110,7 +110,6 @@ struct omap_board_data; struct omap_uart_port_info; extern void omap_serial_init(void); -extern int omap_uart_can_sleep(void); extern void omap_serial_board_init(struct omap_uart_port_info *platform_data); extern void omap_serial_init_port(struct omap_board_data *bdata, struct omap_uart_port_info *platform_data); |