diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 09:41:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 09:41:17 -0700 |
| commit | c3ad33c9bcb6616999953af76f16318120fe3691 (patch) | |
| tree | a6b239cecc675693cfb5145493bd1b750ea360fb /include | |
| parent | fb091be08d1acf184e8801dfdcace6e0cb19b1fe (diff) | |
| parent | b5c80bc5d70a1ce5b071ed06dd95292b9de46f95 (diff) | |
| download | linux-3.10-c3ad33c9bcb6616999953af76f16318120fe3691.tar.gz linux-3.10-c3ad33c9bcb6616999953af76f16318120fe3691.tar.bz2 linux-3.10-c3ad33c9bcb6616999953af76f16318120fe3691.zip | |
Merge branch 'for-linus/i2c-2635' of git://git.fluff.org/bjdooks/linux
* 'for-linus/i2c-2635' of git://git.fluff.org/bjdooks/linux: (21 commits)
i2c-highlander: remover superflous variable
i2c-ibm-iic: drop NO_IRQ
i2c-cpm: drop NO_IRQ
i2c-mpc: drop NO_IRQ
MAINTAINERS: add i2c tree for embedded platforms
i2c-pxa: only define 'blue_murder'-function if DEBUG is #defined
i2c-pxa: remove unused macro
i2c-nomadik: fix operator precedence warning
i2c-nomadik: release region when removed
OMAP3: I2C: Clean up Errata 1p153 handling
OMAP2/3: I2C: Errata ID i207: Clear wrong RDR interrupt
omap: i2c: add a timeout to the busy waiting
omap: i2c: make errata 1.153 workaround a separate function
i2c-omap: add mpu wake up latency constraint in i2c
omap: i2c: Add i2c support on omap4 platform
i2c-bfin-twi: return completion in interrupt for smbus quick transfers
i2c-bfin-twi: remove redundant retry
i2c-bfin-twi: fix lost interrupts at high speeds
i2c-bfin-twi: add debug output for error status
i2c-bfin-twi: integrate timeout timer with completion interface
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/i2c-omap.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/i2c-omap.h b/include/linux/i2c-omap.h new file mode 100644 index 00000000000..78ebf507ce5 --- /dev/null +++ b/include/linux/i2c-omap.h @@ -0,0 +1,9 @@ +#ifndef __I2C_OMAP_H__ +#define __I2C_OMAP_H__ + +struct omap_i2c_bus_platform_data { + u32 clkrate; + void (*set_mpu_wkup_lat)(struct device *dev, long set); +}; + +#endif |