Merge to Fedora kernel-2.6.18-1.2255_FC5 patched with stable patch-2.6.18.5-vs2.0...

[linux-2.6.git] / arch / arm / mach-omap / common.h

diff --git a/arch/arm/mach-omap/common.h b/arch/arm/mach-omap/common.h
index 96dcb3c..9f62858 100644 (file)
--- a/arch/arm/mach-omap/common.h
+++ b/arch/arm/mach-omap/common.h
@@ -27,9 +27,10 @@
 #ifndef __ARCH_ARM_MACH_OMAP_COMMON_H
 #define __ARCH_ARM_MACH_OMAP_COMMON_H
 
+struct sys_timer;
+
 extern void omap_map_io(void);
-extern void omap_init_time(void);
+extern struct sys_timer omap_timer;
+extern void omap_serial_init(int ports[]);
 
 #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */
-
-