diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-15 11:01:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-15 11:01:07 -0800 |
| commit | ecefe4a1c3dcc802c23ef42de6caa08730cfc1a1 (patch) | |
| tree | 1f3424530cee33bf3d0561af6af5b5b1ce792527 /include | |
| parent | 279e1dab949d33737557babfe9f74e0b74fbe39a (diff) | |
| parent | 8b925a3dd8a4d7451092cb9aa11da727ba69e0f0 (diff) | |
| download | op-kernel-dev-ecefe4a1c3dcc802c23ef42de6caa08730cfc1a1.zip op-kernel-dev-ecefe4a1c3dcc802c23ef42de6caa08730cfc1a1.tar.gz | |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c/eeprom: Recognize VGN as a valid Sony Vaio name prefix
i2c/eeprom: Hide Sony Vaio serial numbers
i2c-pasemi: Fix NACK detection
i2c-pasemi: Replace obsolete "driverfs" reference with "sysfs"
i2c: Make i2c_check_addr static
i2c-dev: Unbound new-style i2c clients aren't busy
i2c-dev: "how does it work" comments
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/i2c.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 8033e6b..a100c9f 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -400,11 +400,6 @@ extern int i2c_release_client(struct i2c_client *); extern void i2c_clients_command(struct i2c_adapter *adap, unsigned int cmd, void *arg); -/* returns -EBUSY if address has been taken, 0 if not. Note that the only - other place at which this is called is within i2c_attach_client; so - you can cheat by simply not registering. Not recommended, of course! */ -extern int i2c_check_addr (struct i2c_adapter *adapter, int addr); - /* Detect function. It iterates over all possible addresses itself. * It will only call found_proc if some client is connected at the * specific address (unless a 'force' matched); |
