git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-omap
/
include
/
plat
/
i2c.h
diff --git
a/arch/arm/plat-omap/include/plat/i2c.h
b/arch/arm/plat-omap/include/plat/i2c.h
index 585d9ca68b974c38a4c9ea0abb318f40c65bf9a9..87f6bf2ea4fafbf2864a9f72f630cc5ec56da9a9 100644
(file)
--- a/
arch/arm/plat-omap/include/plat/i2c.h
+++ b/
arch/arm/plat-omap/include/plat/i2c.h
@@
-34,6
+34,5
@@
static inline int omap_register_i2c_bus(int bus_id, u32 clkrate,
}
#endif
-int omap_plat_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);
+void __init omap2_i2c_mux_pins(int bus_id);