diff options
| author | Greg KH <greg@press.(none)> | 2005-10-27 21:59:38 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-27 21:59:38 -0700 |
| commit | 855c54b235e57a23419ca6e108df0757cd4b7e11 (patch) | |
| tree | a761a599454ff46f8cce925194307b89396f1bbc /i2c | |
| parent | d303dfd6695485a8ad35534873952e8405c1825a (diff) | |
| download | patches-855c54b235e57a23419ca6e108df0757cd4b7e11.tar.gz | |
refresh for 2.6.14v2.6.14
Diffstat (limited to 'i2c')
| -rw-r--r-- | i2c/i2c-smbus-pec-01-drop-pec-funcs.patch | 8 | ||||
| -rw-r--r-- | i2c/i2c-smbus-pec-02-swpec-rewrite.patch | 2 | ||||
| -rw-r--r-- | i2c/i2c-smbus-pec-03-drop-swpec-sizes.patch | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/i2c/i2c-smbus-pec-01-drop-pec-funcs.patch b/i2c/i2c-smbus-pec-01-drop-pec-funcs.patch index cee690506f774..b0b4cde17bc7e 100644 --- a/i2c/i2c-smbus-pec-01-drop-pec-funcs.patch +++ b/i2c/i2c-smbus-pec-01-drop-pec-funcs.patch @@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/include/linux/i2c.h +++ gregkh-2.6/include/linux/i2c.h -@@ -390,10 +390,6 @@ struct i2c_msg { +@@ -389,10 +389,6 @@ struct i2c_msg { #define I2C_FUNC_10BIT_ADDR 0x00000002 #define I2C_FUNC_PROTOCOL_MANGLING 0x00000004 /* I2C_M_{REV_DIR_ADDR,NOSTART,..} */ #define I2C_FUNC_SMBUS_HWPEC_CALC 0x00000008 /* SMBus 2.0 */ @@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define I2C_FUNC_SMBUS_BLOCK_PROC_CALL 0x00008000 /* SMBus 2.0 */ #define I2C_FUNC_SMBUS_QUICK 0x00010000 #define I2C_FUNC_SMBUS_READ_BYTE 0x00020000 -@@ -409,8 +405,6 @@ struct i2c_msg { +@@ -408,8 +404,6 @@ struct i2c_msg { #define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK 0x08000000 /* w/ 1-byte reg. addr. */ #define I2C_FUNC_SMBUS_READ_I2C_BLOCK_2 0x10000000 /* I2C-like block xfer */ #define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK_2 0x20000000 /* w/ 2-byte reg. addr. */ @@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define I2C_FUNC_SMBUS_BYTE (I2C_FUNC_SMBUS_READ_BYTE | \ I2C_FUNC_SMBUS_WRITE_BYTE) -@@ -424,17 +418,6 @@ struct i2c_msg { +@@ -423,17 +417,6 @@ struct i2c_msg { I2C_FUNC_SMBUS_WRITE_I2C_BLOCK) #define I2C_FUNC_SMBUS_I2C_BLOCK_2 (I2C_FUNC_SMBUS_READ_I2C_BLOCK_2 | \ I2C_FUNC_SMBUS_WRITE_I2C_BLOCK_2) @@ -58,7 +58,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define I2C_FUNC_SMBUS_EMUL (I2C_FUNC_SMBUS_QUICK | \ I2C_FUNC_SMBUS_BYTE | \ -@@ -442,7 +425,6 @@ struct i2c_msg { +@@ -441,7 +424,6 @@ struct i2c_msg { I2C_FUNC_SMBUS_WORD_DATA | \ I2C_FUNC_SMBUS_PROC_CALL | \ I2C_FUNC_SMBUS_WRITE_BLOCK_DATA | \ diff --git a/i2c/i2c-smbus-pec-02-swpec-rewrite.patch b/i2c/i2c-smbus-pec-02-swpec-rewrite.patch index 2d2673523d2f3..d9814fc61d637 100644 --- a/i2c/i2c-smbus-pec-02-swpec-rewrite.patch +++ b/i2c/i2c-smbus-pec-02-swpec-rewrite.patch @@ -322,7 +322,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/include/linux/i2c.h +++ gregkh-2.6/include/linux/i2c.h -@@ -435,7 +435,7 @@ union i2c_smbus_data { +@@ -434,7 +434,7 @@ union i2c_smbus_data { __u8 byte; __u16 word; __u8 block[I2C_SMBUS_BLOCK_MAX + 2]; /* block[0] is used for length */ diff --git a/i2c/i2c-smbus-pec-03-drop-swpec-sizes.patch b/i2c/i2c-smbus-pec-03-drop-swpec-sizes.patch index 4b592a0e809b4..0f451cd386c04 100644 --- a/i2c/i2c-smbus-pec-03-drop-swpec-sizes.patch +++ b/i2c/i2c-smbus-pec-03-drop-swpec-sizes.patch @@ -53,7 +53,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return -1; --- gregkh-2.6.orig/include/linux/i2c.h +++ gregkh-2.6/include/linux/i2c.h -@@ -452,10 +452,6 @@ union i2c_smbus_data { +@@ -451,10 +451,6 @@ union i2c_smbus_data { #define I2C_SMBUS_BLOCK_DATA 5 #define I2C_SMBUS_I2C_BLOCK_DATA 6 #define I2C_SMBUS_BLOCK_PROC_CALL 7 /* SMBus 2.0 */ |