aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/tvmixer.c4
-rw-r--r--include/linux/i2c.h5
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 8318bd1aad00..5897e5d4d3d2 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -232,12 +232,8 @@ static struct i2c_driver driver = {
232#endif 232#endif
233 .name = "tv card mixer driver", 233 .name = "tv card mixer driver",
234 .id = I2C_DRIVERID_TVMIXER, 234 .id = I2C_DRIVERID_TVMIXER,
235#ifdef I2C_DF_DUMMY
236 .flags = I2C_DF_DUMMY,
237#else
238 .flags = I2C_DF_NOTIFY, 235 .flags = I2C_DF_NOTIFY,
239 .detach_adapter = tvmixer_adapters, 236 .detach_adapter = tvmixer_adapters,
240#endif
241 .attach_adapter = tvmixer_adapters, 237 .attach_adapter = tvmixer_adapters,
242 .detach_client = tvmixer_clients, 238 .detach_client = tvmixer_clients,
243}; 239};
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 5e19a7ba69b2..0316ba1294ca 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)
252 252
253/*flags for the driver struct: */ 253/*flags for the driver struct: */
254#define I2C_DF_NOTIFY 0x01 /* notify on bus (de/a)ttaches */ 254#define I2C_DF_NOTIFY 0x01 /* notify on bus (de/a)ttaches */
255#if 0
256/* this flag is gone -- there is a (optional) driver->detach_adapter
257 * callback now which can be used instead */
258# define I2C_DF_DUMMY 0x02
259#endif
260 255
261/*flags for the client struct: */ 256/*flags for the client struct: */
262#define I2C_CLIENT_ALLOW_USE 0x01 /* Client allows access */ 257#define I2C_CLIENT_ALLOW_USE 0x01 /* Client allows access */