diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 14:03:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 14:03:17 -0800 |
| commit | fe9d1159b299642f9e1a9b56bbf67a24c31bb418 (patch) | |
| tree | 530c6e41beb784adb16a1faae2839edbad2fbb7f /drivers/media/common/saa7146_i2c.c | |
| parent | e5c13537b0153010b4f65b9c55faa78a4c151c93 (diff) | |
| parent | 2236baa75f704851d3cd3310569058151acb1f06 (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: Sanity checks on adapter registration
i2c: Mark i2c_adapter.id as deprecated
i2c: Drivers shouldn't include <linux/i2c-id.h>
i2c: Delete unused adapter IDs
i2c: Remove obsolete cleanup for clientdata
Diffstat (limited to 'drivers/media/common/saa7146_i2c.c')
| -rw-r--r-- | drivers/media/common/saa7146_i2c.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c index 3d88542612e..74ee172b5bc 100644 --- a/drivers/media/common/saa7146_i2c.c +++ b/drivers/media/common/saa7146_i2c.c @@ -391,7 +391,6 @@ static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, in /*****************************************************************************/ /* i2c-adapter helper functions */ -#include <linux/i2c-id.h> /* exported algorithm data */ static struct i2c_algorithm saa7146_algo = { |