Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46a3a575 authored by Michael Krufky's avatar Michael Krufky Committed by Linus Torvalds
Browse files

[PATCH] v4l: 672: fix build for 2.6.14 



- Fix build for 2.6.14

Signed-off-by: default avatarMichael Krufky <mkrufky@m1k.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent caa812e4

drivers/media/video/ir-kbd-i2c.c

+0 −2
Original line number Diff line number Diff line
@@ -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> */

drivers/media/video/saa6588.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

	}