diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/bt8xx/bttvp.h | 2 | ||||
-rw-r--r-- | drivers/media/video/usbvideo/vicam.c | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h index 03816b73f847..27da7b423275 100644 --- a/drivers/media/video/bt8xx/bttvp.h +++ b/drivers/media/video/bt8xx/bttvp.h | |||
@@ -81,8 +81,6 @@ | |||
81 | /* Limits scaled width, which must be a multiple of 4. */ | 81 | /* Limits scaled width, which must be a multiple of 4. */ |
82 | #define MAX_HACTIVE (0x3FF & -4) | 82 | #define MAX_HACTIVE (0x3FF & -4) |
83 | 83 | ||
84 | #define clamp(x, low, high) min (max (low, x), high) | ||
85 | |||
86 | #define BTTV_NORMS (\ | 84 | #define BTTV_NORMS (\ |
87 | V4L2_STD_PAL | V4L2_STD_PAL_N | \ | 85 | V4L2_STD_PAL | V4L2_STD_PAL_N | \ |
88 | V4L2_STD_PAL_Nc | V4L2_STD_SECAM | \ | 86 | V4L2_STD_PAL_Nc | V4L2_STD_SECAM | \ |
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c index 64819353276a..17f542dfb366 100644 --- a/drivers/media/video/usbvideo/vicam.c +++ b/drivers/media/video/usbvideo/vicam.c | |||
@@ -70,12 +70,6 @@ | |||
70 | 70 | ||
71 | #define VICAM_HEADER_SIZE 64 | 71 | #define VICAM_HEADER_SIZE 64 |
72 | 72 | ||
73 | #define clamp( x, l, h ) max_t( __typeof__( x ), \ | ||
74 | ( l ), \ | ||
75 | min_t( __typeof__( x ), \ | ||
76 | ( h ), \ | ||
77 | ( x ) ) ) | ||
78 | |||
79 | /* Not sure what all the bytes in these char | 73 | /* Not sure what all the bytes in these char |
80 | * arrays do, but they're necessary to make | 74 | * arrays do, but they're necessary to make |
81 | * the camera work. | 75 | * the camera work. |