---

yaml --- r: 16680 b: refs/heads/master c: ff179c8 h: refs/heads/master v: v3
git-mirror · Jan 6, 2006 · 1843e52 · 1843e52
1 parent 80df7f6
commit 1843e52
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1de9e371b89e1cf4da123f0d92efa8eb134ca5e8
+refs/heads/master: ff179c8cf5caa17bf3d407edbb5872aa2eee6900
diff --git a/trunk/drivers/media/video/tvmixer.c b/trunk/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/trunk/include/linux/i2c.h b/trunk/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 */