[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>
This commit is contained in:
committed by
Linus Torvalds
parent
caa812e4a5
commit
46a3a575bc
@@ -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> */
|
||||||
|
@@ -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;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user