diff options
| author | Michael Krufky <mkrufky@m1k.net> | 2005-11-08 21:36:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 07:56:11 -0800 |
| commit | 46a3a575bcc6a82b8538dd7a02fef634853ad31e (patch) | |
| tree | 87cd9c9114ae7e379dacf2ee92c34586a7c19e41 /drivers/media/video | |
| parent | caa812e4a5d77703f4839b5d25139aa05615ddb3 (diff) | |
[PATCH] v4l: 672: fix build for 2.6.14
- Fix build for 2.6.14
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/ir-kbd-i2c.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/saa6588.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c index 9703d3d351f..225fee93cfd 100644 --- a/drivers/media/video/ir-kbd-i2c.c +++ b/drivers/media/video/ir-kbd-i2c.c @@ -37,9 +37,7 @@ #include <linux/slab.h> #include <linux/i2c.h> #include <linux/workqueue.h> - #include <asm/semaphore.h> - #include <media/ir-common.h> /* Mark Phalan <phalanm@o2.ie> */ diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c index 31a9797bd97..5252a4ca3fd 100644 --- a/drivers/media/video/saa6588.c +++ b/drivers/media/video/saa6588.c @@ -434,9 +434,9 @@ static int saa6588_probe(struct i2c_adapter *adap) return i2c_probe(adap, &addr_data, saa6588_attach); #else switch (adap->id) { - case I2C_ALGO_BIT | I2C_HW_B_BT848: - case I2C_ALGO_BIT | I2C_HW_B_RIVA: - case I2C_ALGO_SAA7134: + case I2C_HW_B_BT848: + case I2C_HW_B_RIVA: + case I2C_HW_SAA7134: return i2c_probe(adap, &addr_data, saa6588_attach); break; } |