diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-31 21:03:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-31 21:03:23 -0400 |
| commit | 50440c6dcccbf90ee3629407cb13ca09cab7d900 (patch) | |
| tree | 6441432e78ec884863e5104ad4893e2a3dbe8059 /drivers/staging | |
| parent | 09d692e6ff50e455f936e7e114e11f6ec5e0ea33 (diff) | |
| parent | 55fee8d7f7cb011d7f161cf816220ac74e34b6b1 (diff) | |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c-i801: Add PCI idents for Patsburg 'IDF' SMBus controllers
i2c-i801: Handle multiple instances instead of keeping global state
i2c-i801: Add Intel Patsburg device ID
i2c: Drop unused I2C_CLASS_TV flags
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/tm6000/tm6000-i2c.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/tm6000/tm6000-i2c.c b/drivers/staging/tm6000/tm6000-i2c.c index 3e46866dd279..93f625fc852b 100644 --- a/drivers/staging/tm6000/tm6000-i2c.c +++ b/drivers/staging/tm6000/tm6000-i2c.c | |||
| @@ -320,7 +320,6 @@ static struct i2c_algorithm tm6000_algo = { | |||
| 320 | 320 | ||
| 321 | static struct i2c_adapter tm6000_adap_template = { | 321 | static struct i2c_adapter tm6000_adap_template = { |
| 322 | .owner = THIS_MODULE, | 322 | .owner = THIS_MODULE, |
| 323 | .class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL, | ||
| 324 | .name = "tm6000", | 323 | .name = "tm6000", |
| 325 | .algo = &tm6000_algo, | 324 | .algo = &tm6000_algo, |
| 326 | }; | 325 | }; |