summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/tvp5150.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-02-08 11:05:37 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-02-08 11:05:37 -0200
commit6c16e60ebc542dfe803c0070aaf3e356185b521a (patch)
tree2aa7c6c70920c0f4a67a58a202f34f403df3a671 /linux/drivers/media/video/tvp5150.c
parent243c1d1fa0d09431bf84f02e4a20c002da7c08c7 (diff)
parent56a304929cac33ceb38bbb90f4bb30c9477f64d5 (diff)
downloadmediapointer-dvb-s2-6c16e60ebc542dfe803c0070aaf3e356185b521a.tar.gz
mediapointer-dvb-s2-6c16e60ebc542dfe803c0070aaf3e356185b521a.tar.bz2
Merged patch 3310 at tip
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/tvp5150.c')
-rw-r--r--linux/drivers/media/video/tvp5150.c2
1 files changed, 1 insertions, 1 deletions
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;