Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[mv-sheeva.git] / arch / arm / mach-omap1 / i2c.c

diff --git a/arch/arm/mach-omap1/i2c.c b/arch/arm/mach-omap1/i2c.c
index 1bf4735e27a636285ad512f26b5cff0b7b519748..5446c9912641fa502416ba6e9ce01f8215a67bee 100644 (file)
--- a/arch/arm/mach-omap1/i2c.c
+++ b/arch/arm/mach-omap1/i2c.c
@@ -23,9 +23,7 @@
 #include <plat/mux.h>
 #include <plat/cpu.h>
 
-int __init omap_register_i2c_bus(int bus_id, u32 clkrate,
-                         struct i2c_board_info const *info,
-                         unsigned len)
+void __init omap1_i2c_mux_pins(int bus_id)
 {
        if (cpu_is_omap7xx()) {
                omap_cfg_reg(I2C_7XX_SDA);
@@ -34,6 +32,4 @@ int __init omap_register_i2c_bus(int bus_id, u32 clkrate,
                omap_cfg_reg(I2C_SDA);
                omap_cfg_reg(I2C_SCL);
        }
-
-       return omap_plat_register_i2c_bus(bus_id, clkrate, info, len);
 }