diff options
author | Olof Johansson <olof@lixom.net> | 2012-03-10 09:10:21 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-03-10 09:10:21 -0800 |
commit | 86ca5b6fef2bf1aa77a62f29d844400e4fed8dde (patch) | |
tree | 22297e3d959eebb013644fb8fe6be5fdf6819590 /arch/arm/plat-omap | |
parent | e65bc8918f75620f1668d321b048bfa336ccc0fa (diff) | |
parent | dd713e97f7e08b5742d9252f404cde34b97e1587 (diff) | |
download | op-kernel-dev-86ca5b6fef2bf1aa77a62f29d844400e4fed8dde.zip op-kernel-dev-86ca5b6fef2bf1aa77a62f29d844400e4fed8dde.tar.gz |
Merge branch 'uart' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
* 'uart' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: remove some orphan function declarations.
ARM: OMAP2+: UART: remove unused fields in omap_uart_state.
Diffstat (limited to 'arch/arm/plat-omap')
-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 198d1e6..b073e5f 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); |