* 'for-linus/i2c-3.2' of git://git.fluff.org/bjdooks/linux: (47 commits) i2c-s3c2410: Add device tree support i2c-s3c2410: Keep a copy of platform data and use it i2c-nomadik: cosmetic coding style corrections i2c-au1550: dev_pm_ops conversion i2c-au1550: increase timeout waiting for master done i2c-au1550: remove unused ack_timeout i2c-au1550: remove usage of volatile keyword i2c-tegra: __iomem annotation fix i2c-eg20t: Add initialize processing in case i2c-error occurs i2c-eg20t: Fix flag setting issue i2c-eg20t: add stop sequence in case wait-event timeout occurs i2c-eg20t: Separate error processing i2c-eg20t: Fix 10bit access issue i2c-eg20t: Modify returned value s32 to long i2c-eg20t: Fix bus-idle waiting issue i2c-designware: Fix PCI core warning on suspend/resume i2c-designware: Add runtime power management support i2c-designware: Add support for Designware core behind PCI devices. i2c-designware: Push all register reads/writes into the core code. i2c-designware: Support multiple cores using same ISR ...
Showing the changes to include/linux (1 of 26 files). Show all
Unified · Split
| @@ -32,10 +32,9 @@ · 31 unmodified lines | |||
| 32 | 32 | ||
| 33 | struct omap_i2c_bus_platform_data { | 33 | struct omap_i2c_bus_platform_data { |
| 34 | u32 clkrate; | 34 | u32 clkrate; |
| 35 | u32 rev; | ||
| 36 | u32 flags; | ||
| 35 | void (*set_mpu_wkup_lat)(struct device *dev, long set); | 37 | void (*set_mpu_wkup_lat)(struct device *dev, long set); |
| 36 | int (*device_enable) (struct platform_device *pdev); | ||
| 37 | int (*device_shutdown) (struct platform_device *pdev); | ||
| 38 | int (*device_idle) (struct platform_device *pdev); | ||
| 39 | }; | 38 | }; |
| 40 | 39 | ||
| 41 | #endif | 40 | #endif |