lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] v4l: 672: fix build for 2.6.14

Browse Source 
- 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>
This commit is contained in:
Michael Krufky
2005-11-08 21:36:39 -08:00
committed by Linus Torvalds
parent caa812e4a5
commit 46a3a575bc
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/video/ir-kbd-i2c.c
View File

@@ -37,9 +37,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <asm/semaphore.h> #include <asm/semaphore.h>
#include <media/ir-common.h> #include <media/ir-common.h>
/* Mark Phalan <phalanm@o2.ie> */ /* Mark Phalan <phalanm@o2.ie> */

6
drivers/media/video/saa6588.c
View File

@@ -434,9 +434,9 @@ static int saa6588_probe(struct i2c_adapter *adap)
return i2c_probe(adap, &addr_data, saa6588_attach); return i2c_probe(adap, &addr_data, saa6588_attach);
#else #else
switch (adap->id) { switch (adap->id) {
case I2C_ALGO_BIT | I2C_HW_B_BT848: case I2C_HW_B_BT848:
case I2C_ALGO_BIT | I2C_HW_B_RIVA: case I2C_HW_B_RIVA:
case I2C_ALGO_SAA7134: case I2C_HW_SAA7134:
return i2c_probe(adap, &addr_data, saa6588_attach); return i2c_probe(adap, &addr_data, saa6588_attach);
break; break;
} }