diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 08:28:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 08:28:50 -0700 |
| commit | 9ffc1699e36abd5baee188c8e36b1bb27d0d4278 (patch) | |
| tree | ce07bb773305b38ec672e1e37f48bd6ecfdc8dc4 /include | |
| parent | a01386924874c4d6d67f8a34e66f04452c2abb69 (diff) | |
| parent | 958585f58f675a3c2855c7d91b6fdd2875552d0b (diff) | |
Merge branch 'i2c-for-linus' of git://aeryn.fluff.org.uk/bjdooks/linux
* 'i2c-for-linus' of git://aeryn.fluff.org.uk/bjdooks/linux:
i2c: Blackfin I2C Driver: Functional power management support
i2c: Documentation: upgrading clients HOWTO
i2c: S3C24XX I2C frequency scaling support.
i2c: i2c_gpio: keep probe resident for hotplugged devices.
i2c: S3C2410: Pass the I2C bus number via drivers platform data
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/plat-s3c/iic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/plat-s3c/iic.h b/include/asm-arm/plat-s3c/iic.h index 71211c8b538..d08a1f2863e 100644 --- a/include/asm-arm/plat-s3c/iic.h +++ b/include/asm-arm/plat-s3c/iic.h @@ -21,6 +21,7 @@ */ struct s3c2410_platform_i2c { + int bus_num; /* bus number to use */ unsigned int flags; unsigned int slave_addr; /* slave address for controller */ unsigned long bus_freq; /* standard bus frequency */ |