summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-11-12 19:32:57 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-11-12 19:32:57 -0800
commitdbda961be73329e4fc4b1dbc7335ddb70a625c5d (patch)
treec6f4aae48ddac66b977c09f0be552ab37b2f54b3 /include/linux
parent717abc98fe8ba4fcb2c02eb1609c6a68fe7d9c4f (diff)
parent95e475c924efd3b429df1ca3af2accf8eeac90cf (diff)
Merge bk://kernel.bkbits.net/gregkh/linux/i2c-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/i2c.h16
1 files changed, 4 insertions, 12 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index bd2735bdca6b..3000c102171e 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -88,20 +88,12 @@ extern s32 i2c_smbus_write_byte_data(struct i2c_client * client,
extern s32 i2c_smbus_read_word_data(struct i2c_client * client, u8 command);
extern s32 i2c_smbus_write_word_data(struct i2c_client * client,
u8 command, u16 value);
-extern s32 i2c_smbus_process_call(struct i2c_client * client,
- u8 command, u16 value);
-/* Returns the number of read bytes */
-extern s32 i2c_smbus_read_block_data(struct i2c_client * client,
- u8 command, u8 *values);
+/* Returns the number of bytes transferred */
extern s32 i2c_smbus_write_block_data(struct i2c_client * client,
- u8 command, u8 length,
- u8 *values);
+ u8 command, u8 length,
+ u8 *values);
extern s32 i2c_smbus_read_i2c_block_data(struct i2c_client * client,
- u8 command, u8 *values);
-extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client * client,
- u8 command, u8 length,
- u8 *values);
-
+ u8 command, u8 *values);
/*
* A driver is capable of handling one or more physical devices present on