[PATCH] i2c: Drop out-of-date, colliding ioctl definitions

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 <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 6a1f342..74103d0 100644 (file)
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -503,11 +503,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          */