diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-23 22:59:26 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-23 22:59:26 +0100 |
| commit | 33f145934025e2f51e866993f09e04a1d1650649 (patch) | |
| tree | 82fc648488e32ef43c2e97da78a0a5d1064e76ef /include | |
| parent | Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/... (diff) | |
| parent | i2c: mxs: Handle i2c DMA failure properly (diff) | |
| download | linux-33f145934025e2f51e866993f09e04a1d1650649.tar.xz linux-33f145934025e2f51e866993f09e04a1d1650649.zip | |
Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Bugfixes for the i2c subsystem.
Except for a few one-liners, there is mainly one revert because of an
overlooked dependency. Since there is no linux-next at the moment, I
did some extra testing, and all was fine for me."
* 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux:
i2c: mxs: Handle i2c DMA failure properly
i2c: s3c2410: Fix code to free gpios
i2c: omap: ensure writes to dev->buf_len are ordered
Revert "ARM: OMAP: convert I2C driver to PM QoS for MPU latency constraints"
i2c: at91: fix SMBus quick command
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/i2c-omap.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/i2c-omap.h b/include/linux/i2c-omap.h index df804ba73e0b..92a0dc75bc74 100644 --- a/include/linux/i2c-omap.h +++ b/include/linux/i2c-omap.h @@ -34,6 +34,7 @@ struct omap_i2c_bus_platform_data { u32 clkrate; u32 rev; u32 flags; + void (*set_mpu_wkup_lat)(struct device *dev, long set); }; #endif |