Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

[sfrench/cifs-2.6.git] / arch / arm / plat-omap / include / mach / serial.h

diff --git a/arch/arm/plat-omap/include/mach/serial.h b/arch/arm/plat-omap/include/mach/serial.h
index def0529c75eb8ccc764657ee1bec2aa237ed9b62..e249186d26e2b824d1017e31fdc1d309e5e31e17 100644 (file)
--- a/arch/arm/plat-omap/include/mach/serial.h
+++ b/arch/arm/plat-omap/include/mach/serial.h
@@ -13,6 +13,8 @@
 #ifndef __ASM_ARCH_SERIAL_H
 #define __ASM_ARCH_SERIAL_H
 
+#include <linux/init.h>
+
 #if defined(CONFIG_ARCH_OMAP1)
 /* OMAP1 serial ports */
 #define OMAP_UART1_BASE                0xfffb0000
@@ -53,6 +55,7 @@
                        })
 
 #ifndef __ASSEMBLER__
+extern void __init omap_serial_early_init(void);
 extern void omap_serial_init(void);
 extern int omap_uart_can_sleep(void);
 extern void omap_uart_check_wakeup(void);