diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-15 17:59:29 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-15 17:59:29 -0500 |
| commit | f1dccedc8148026d9071c6805f7cb77374a9e56f (patch) | |
| tree | ba4a630084b8d21309930321ff53a6ed4381c0f3 /drivers/media/video/tvp5150.c | |
| parent | c943aa859c392eb4cc76d911daa1f261555075b2 (diff) | |
| parent | 0238cb4e7583c521bb3538060f98a73e65f61324 (diff) | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/media/video/tvp5150.c')
| -rw-r--r-- | drivers/media/video/tvp5150.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c index e86b522938fd..9094fa9f2ecb 100644 --- a/drivers/media/video/tvp5150.c +++ b/drivers/media/video/tvp5150.c | |||
| @@ -93,7 +93,7 @@ struct tvp5150 { | |||
| 93 | int sat; | 93 | int sat; |
| 94 | }; | 94 | }; |
| 95 | 95 | ||
| 96 | static inline int tvp5150_read(struct i2c_client *c, unsigned char addr) | 96 | static int tvp5150_read(struct i2c_client *c, unsigned char addr) |
| 97 | { | 97 | { |
| 98 | unsigned char buffer[1]; | 98 | unsigned char buffer[1]; |
| 99 | int rc; | 99 | int rc; |