summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-14 11:57:54 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-14 11:57:54 -0700
commitd0a0c28cf178943afaf22f87957b73c47497cb4b (patch)
treec07ee70a42bdf046d0ce8540b4e86d2c16f05b6c /arch/arm
parentce00f7feb0a497b4280e1efe16e03728ed292687 (diff)
parentf6e1901c4c596238abe6735bb20593f2734f757e (diff)
Merge branch 'for-linus/i2c-2636' of git://git.fluff.org/bjdooks/linux
* 'for-linus/i2c-2636' of git://git.fluff.org/bjdooks/linux: i2c/nuc900: add i2c driver support for nuc900 i2c: Enable NXP LPC support in Kconfig i2c-pxa: fix compiler warning, due to missing const i2c: davinci: bus recovery procedure to clear the bus i2c: davinci: Add cpufreq support i2c: davinci: Add suspend/resume support i2c: davinci: Add helper functions for power management i2c: davinci: misc. cleanups: remove MOD_REG_BIT and IO_ADDRESS usage i2c: davinci: Fix smbus Oops with AIC33 usage
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-w90x900/include/mach/i2c.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-w90x900/include/mach/i2c.h b/arch/arm/mach-w90x900/include/mach/i2c.h
new file mode 100644
index 00000000000..9ffb12d06e9
--- /dev/null
+++ b/arch/arm/mach-w90x900/include/mach/i2c.h
@@ -0,0 +1,9 @@
+#ifndef __ASM_ARCH_NUC900_I2C_H
+#define __ASM_ARCH_NUC900_I2C_H
+
+struct nuc900_platform_i2c {
+ int bus_num;
+ unsigned long bus_freq;
+};
+
+#endif /* __ASM_ARCH_NUC900_I2C_H */