From aad070abd00ac2b3c13cc5d1ce0ec70517e0ab69 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sun, 19 Oct 2008 09:47:02 +0000 Subject: [PATCH] Drop I2C_FUNC_SMBUS_*I2C_BLOCK_2 defines, as was just done in the Linux 2.6 kernel. git-svn-id: http://lm-sensors.org/svn/i2c-tools/trunk@5361 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 1 + include/linux/i2c-dev.h | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index e424e17..2605557 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,7 @@ i2c-tools CHANGES ----------------- SVN + i2c-dev.h: Drop I2C_FUNC_SMBUS_*I2C_BLOCK_2 defines decode-dimms: Add support for little-endian word hexdumps decode-vaio: Remove history i2cdetect: Support i2c bus passed by name diff --git a/include/linux/i2c-dev.h b/include/linux/i2c-dev.h index 0e1291b..15db8b0 100644 --- a/include/linux/i2c-dev.h +++ b/include/linux/i2c-dev.h @@ -67,8 +67,6 @@ struct i2c_msg { #define I2C_FUNC_SMBUS_WRITE_BLOCK_DATA 0x02000000 #define I2C_FUNC_SMBUS_READ_I2C_BLOCK 0x04000000 /* I2C-like block xfer */ #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. */ #define I2C_FUNC_SMBUS_BYTE (I2C_FUNC_SMBUS_READ_BYTE | \ I2C_FUNC_SMBUS_WRITE_BYTE) @@ -80,8 +78,6 @@ struct i2c_msg { I2C_FUNC_SMBUS_WRITE_BLOCK_DATA) #define I2C_FUNC_SMBUS_I2C_BLOCK (I2C_FUNC_SMBUS_READ_I2C_BLOCK | \ 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) /* Old name, for compatibility */ #define I2C_FUNC_SMBUS_HWPEC_CALC I2C_FUNC_SMBUS_PEC