Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge

1 files changed, 10 insertions, 0 deletions

diff --git a/include/linux/i2c/s6000.h b/include/linux/i2c/s6000.h
new file mode 100644
index 000000000000..d9b34bfdae76
--- /dev/null
+++ b/include/linux/i2c/s6000.h
@@ -0,0 +1,10 @@
+#ifndef __LINUX_I2C_S6000_H
+#define __LINUX_I2C_S6000_H
+
+struct s6_i2c_platform_data {
+        const char *clock; /* the clock to use */
+        int bus_num; /* the bus number to register */
+};
+
+#endif
+