From: Andrew Morton Cc: Harvey Harrison Cc: Mauro Carvalho Chehab Signed-off-by: Andrew Morton --- drivers/media/video/bt8xx/bttvp.h | 2 -- drivers/media/video/usbvideo/vicam.c | 6 ------ 2 files changed, 8 deletions(-) diff -puN include/linux/kernel.h~kernel-add-clamp-and-clamp_t-macros-fix include/linux/kernel.h diff -puN drivers/media/video/bt8xx/bttvp.h~kernel-add-clamp-and-clamp_t-macros-fix drivers/media/video/bt8xx/bttvp.h --- a/drivers/media/video/bt8xx/bttvp.h~kernel-add-clamp-and-clamp_t-macros-fix +++ a/drivers/media/video/bt8xx/bttvp.h @@ -82,8 +82,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 | \ diff -puN drivers/media/video/usbvideo/vicam.c~kernel-add-clamp-and-clamp_t-macros-fix drivers/media/video/usbvideo/vicam.c --- a/drivers/media/video/usbvideo/vicam.c~kernel-add-clamp-and-clamp_t-macros-fix +++ a/drivers/media/video/usbvideo/vicam.c @@ -70,12 +70,6 @@ #define VICAM_HEADER_SIZE 64 -#define clamp( x, l, h ) max_t( __typeof__( x ), \ - ( l ), \ - min_t( __typeof__( x ), \ - ( h ), \ - ( x ) ) ) - /* Not sure what all the bytes in these char * arrays do, but they're necessary to make * the camera work. _