aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-11-30 17:45:49 -0500
committerTony Lindgren <tony@atomide.com>2010-11-30 17:45:49 -0500
commit55a4e78952286d498d89a399d845e7cfaa8ddd56 (patch)
treef5d67bdaa07b36009476d2e1bdcde8b7dc0c6e3d /include/linux
parent9c7bc451e41abf78b0fd856a9f916f7d39e26297 (diff)
parent27b1fec2caa668c162cd1a862c69e087df277fae (diff)
Merge branch 'pm-hwmod-i2c' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/i2c-omap.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/i2c-omap.h b/include/linux/i2c-omap.h
index 78ebf507ce56..7472449cbb74 100644
--- a/include/linux/i2c-omap.h
+++ b/include/linux/i2c-omap.h
@@ -1,9 +1,14 @@
1#ifndef __I2C_OMAP_H__ 1#ifndef __I2C_OMAP_H__
2#define __I2C_OMAP_H__ 2#define __I2C_OMAP_H__
3 3
4#include <linux/platform_device.h>
5
4struct omap_i2c_bus_platform_data { 6struct omap_i2c_bus_platform_data {
5 u32 clkrate; 7 u32 clkrate;
6 void (*set_mpu_wkup_lat)(struct device *dev, long set); 8 void (*set_mpu_wkup_lat)(struct device *dev, long set);
9 int (*device_enable) (struct platform_device *pdev);
10 int (*device_shutdown) (struct platform_device *pdev);
11 int (*device_idle) (struct platform_device *pdev);
7}; 12};
8 13
9#endif 14#endif