From khali@linux-fr.org Fri Oct 7 15:09:47 2005 Date: Sat, 8 Oct 2005 00:06:09 +0200 From: Jean Delvare To: Greg KH Subject: [PATCH 08/16] i2c: Drop out-of-date, colliding ioctl definitions Message-Id: <20051008000609.5846697a.khali@linux-fr.org> Delete 2 out-of-date, colliding ioctl defines. I2C_UDELAY and I2C_MDELAY are supposed to be used by i2c-algo-bit, but actually aren't (and I suspect never were). Moreover, their values are the same as I2C_FUNCS and I2C_SLAVE_FORCE, respectively, which *are* widely used. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman --- include/linux/i2c.h | 5 ----- 1 file changed, 5 deletions(-) --- gregkh-2.6.orig/include/linux/i2c.h +++ gregkh-2.6/include/linux/i2c.h @@ -504,11 +504,6 @@ union i2c_smbus_data { #define I2C_SMBUS 0x0720 /* SMBus-level access */ -/* ... algo-bit.c recognizes */ -#define I2C_UDELAY 0x0705 /* set delay in microsecs between each */ - /* written byte (except address) */ -#define I2C_MDELAY 0x0706 /* millisec delay between written bytes */ - /* ----- I2C-DEV: char device interface stuff ------------------------- */ #define I2C_MAJOR 89 /* Device major number */