diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-12 19:31:29 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-12 19:31:29 +0000 |
| commit | 505dee96b5f86facce4200d260ffec2fb5a737b8 (patch) | |
| tree | 97847ee3123a103edf5ab95a98d6c163d6c9e4bd /linux | |
| parent | 609bc704ffcafedc2596bd393b0aab789fa7f9f6 (diff) | |
| download | mediapointer-dvb-s2-505dee96b5f86facce4200d260ffec2fb5a737b8.tar.gz mediapointer-dvb-s2-505dee96b5f86facce4200d260ffec2fb5a737b8.tar.bz2 | |
v4l2: Move bounding code outside I2C ifdef block
From: Trent Piepho <xyzzy@speakeasy.org>
On Fri, 12 Jun 2009, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Move v4l_bound_align_image() outside of an #ifdef CONFIG_I2C block
> so that it is always built. Fixes a build error:
clamp_align() should be moved as well, since it's only used by
v4l_bound_align_image(). I'm attaching an alternate version that fixes
this. Labeled the endif too.
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Priority: normal
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/v4l2-common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/v4l2-common.c b/linux/drivers/media/video/v4l2-common.c index d81bae197..ba3790a98 100644 --- a/linux/drivers/media/video/v4l2-common.c +++ b/linux/drivers/media/video/v4l2-common.c @@ -997,6 +997,8 @@ const unsigned short *v4l2_i2c_tuner_addrs(enum v4l2_i2c_tuner_type type) } EXPORT_SYMBOL_GPL(v4l2_i2c_tuner_addrs); +#endif /* defined(CONFIG_I2C) */ + /* Clamp x to be between min and max, aligned to a multiple of 2^align. min * and max don't have to be aligned, but there must be at least one valid * value. E.g., min=17,max=31,align=4 is not allowed as there are no multiples @@ -1067,5 +1069,3 @@ void v4l_bound_align_image(u32 *w, unsigned int wmin, unsigned int wmax, } } EXPORT_SYMBOL_GPL(v4l_bound_align_image); - -#endif |