From aaf40c6ff3028f2396368689550f0141c7eebb07 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 6 Feb 2006 10:02:56 -0200 Subject: Sync patches to kernel From: Mauro Carvalho Chehab dvb_bt8xx_remove return code changed to zero to avoid warning tvp5150_read doesn't need to be inline Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/tvp5150.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux/drivers/media/video/tvp5150.c') diff --git a/linux/drivers/media/video/tvp5150.c b/linux/drivers/media/video/tvp5150.c index da9c9e944..d3b64130e 100644 --- a/linux/drivers/media/video/tvp5150.c +++ b/linux/drivers/media/video/tvp5150.c @@ -124,7 +124,7 @@ struct tvp5150 { int sat; }; -static inline int tvp5150_read(struct i2c_client *c, unsigned char addr) +static int tvp5150_read(struct i2c_client *c, unsigned char addr) { unsigned char buffer[1]; int rc; -- cgit v1.2.3