diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-02 00:57:47 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-02 00:57:47 -0300 |
| commit | a2f35a3ccf9953ece897da27cd27701c60bc296d (patch) | |
| tree | 8a0ccab4a3376e23a477729bb8e783d0d4c47bc9 /linux/drivers/media/video/bt8xx/bttvp.h | |
| parent | 0dd5bfe651abdb225c8b2d9fcdcd251c5a175e88 (diff) | |
| download | mediapointer-dvb-s2-a2f35a3ccf9953ece897da27cd27701c60bc296d.tar.gz mediapointer-dvb-s2-a2f35a3ccf9953ece897da27cd27701c60bc296d.tar.bz2 | |
backport commit bdf4bbaaee3d4b8f555658333cbce1affe9070fb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date: Wed Apr 30 00:54:55 2008 -0700
Add macros similar to min/max/min_t/max_t
Also, change the variable names used in the min/max macros to avoid shadowed
variable warnings when min/max min_t/max_t are nested.
Small formatting changes to make all the macros have a similar form.
[akpm@linux-foundation.org: coding-style fixes]
[akpm@linux-foundation.org: fix v4l build]
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttvp.h')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttvp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttvp.h b/linux/drivers/media/video/bt8xx/bttvp.h index e9219458e..b8ab81fb8 100644 --- a/linux/drivers/media/video/bt8xx/bttvp.h +++ b/linux/drivers/media/video/bt8xx/bttvp.h @@ -90,8 +90,6 @@ /* Limits scaled width, which must be a multiple of 4. */ #define MAX_HACTIVE (0x3FF & -4) -#define clamp(x, low, high) min (max (low, x), high) - #define BTTV_NORMS (\ V4L2_STD_PAL | V4L2_STD_PAL_N | \ V4L2_STD_PAL_Nc | V4L2_STD_SECAM | \ |