diff options
| author | Jean Delvare <khali@linux-fr.org> | 2005-11-26 20:24:59 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-05 22:16:21 -0800 |
| commit | ff179c8cf5caa17bf3d407edbb5872aa2eee6900 (patch) | |
| tree | ac10dc7a3c5be7f8cd1d88736cf508600c19b8d7 | |
| parent | 1de9e371b89e1cf4da123f0d92efa8eb134ca5e8 (diff) | |
| download | linux-3.10-ff179c8cf5caa17bf3d407edbb5872aa2eee6900.tar.gz linux-3.10-ff179c8cf5caa17bf3d407edbb5872aa2eee6900.tar.bz2 linux-3.10-ff179c8cf5caa17bf3d407edbb5872aa2eee6900.zip | |
[PATCH] i2c: Drop i2c_driver.flags, 1 of 3
The I2C_DF_DUMMY flag is gone since 2.5.70, it's about time to
drop all ifdef'd out references thereto.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/media/video/tvmixer.c | 4 | ||||
| -rw-r--r-- | include/linux/i2c.h | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c index 8318bd1aad0..5897e5d4d3d 100644 --- a/drivers/media/video/tvmixer.c +++ b/drivers/media/video/tvmixer.c @@ -232,12 +232,8 @@ static struct i2c_driver driver = { #endif .name = "tv card mixer driver", .id = I2C_DRIVERID_TVMIXER, -#ifdef I2C_DF_DUMMY - .flags = I2C_DF_DUMMY, -#else .flags = I2C_DF_NOTIFY, .detach_adapter = tvmixer_adapters, -#endif .attach_adapter = tvmixer_adapters, .detach_client = tvmixer_clients, }; diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 5e19a7ba69b..0316ba1294c 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -252,11 +252,6 @@ static inline void i2c_set_adapdata (struct i2c_adapter *dev, void *data) /*flags for the driver struct: */ #define I2C_DF_NOTIFY 0x01 /* notify on bus (de/a)ttaches */ -#if 0 -/* this flag is gone -- there is a (optional) driver->detach_adapter - * callback now which can be used instead */ -# define I2C_DF_DUMMY 0x02 -#endif /*flags for the client struct: */ #define I2C_CLIENT_ALLOW_USE 0x01 /* Client allows access */ |