X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=include%2Fasm-arm%2Farch-omap%2Fcommon.h;h=224e009e529633a07042429c4f51cf93c5781799;hb=b4de123a0bc4a3f0c90899864d51299628729952;hp=2a676b4f13b5dedb4eeb9f227f8fa4120b6e66b8;hpb=31151ba2cef171344beac254e65bd7e00138bb0d;p=mirror_ubuntu-kernels.git

diff --git a/include/asm-arm/arch-omap/common.h b/include/asm-arm/arch-omap/common.h
index 2a676b4f13b5..224e009e5296 100644
--- a/include/asm-arm/arch-omap/common.h
+++ b/include/asm-arm/arch-omap/common.h
@@ -27,10 +27,24 @@
 #ifndef __ARCH_ARM_MACH_OMAP_COMMON_H
 #define __ARCH_ARM_MACH_OMAP_COMMON_H
 
+#include <linux/i2c.h>
+
 struct sys_timer;
 
 extern void omap_map_common_io(void);
 extern struct sys_timer omap_timer;
-extern void omap_serial_init(int ports[]);
+extern void omap_serial_init(void);
+#ifdef CONFIG_I2C_OMAP
+extern int omap_register_i2c_bus(int bus_id, u32 clkrate,
+				 struct i2c_board_info const *info,
+				 unsigned len);
+#else
+static inline int omap_register_i2c_bus(int bus_id, u32 clkrate,
+				 struct i2c_board_info const *info,
+				 unsigned len)
+{
+	return 0;
+}
+#endif
 
 #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */