aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/uvc
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@skynet.be>2009-06-26 10:41:04 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-12 11:17:18 -0400
commit446a164b70655d7cc19f6e9023c129b7425eb0f8 (patch)
treecc416249d8b407727c27ed95e13639a89c03d452 /drivers/media/video/uvc
parentb482d9231a73478763e6b42fd88ea453731a67eb (diff)
V4L/DVB (12186): uvcvideo: Remove unused Logitech-specific constants
Those constants are not used anymore, remove them. Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/uvc')
-rw-r--r--drivers/media/video/uvc/uvcvideo.h17
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h
index a860c6ba0eae..cc5023e09ca9 100644
--- a/drivers/media/video/uvc/uvcvideo.h
+++ b/drivers/media/video/uvc/uvcvideo.h
@@ -174,10 +174,6 @@ struct uvc_xu_control {
174#define UVC_PU_ANALOG_VIDEO_STANDARD_CONTROL 0x11 174#define UVC_PU_ANALOG_VIDEO_STANDARD_CONTROL 0x11
175#define UVC_PU_ANALOG_LOCK_STATUS_CONTROL 0x12 175#define UVC_PU_ANALOG_LOCK_STATUS_CONTROL 0x12
176 176
177#define UVC_LXU_MOTOR_PANTILT_RELATIVE_CONTROL 0x01
178#define UVC_LXU_MOTOR_PANTILT_RESET_CONTROL 0x02
179#define UVC_LXU_MOTOR_FOCUS_MOTOR_CONTROL 0x03
180
181/* VideoStreaming interface controls */ 177/* VideoStreaming interface controls */
182#define UVC_VS_CONTROL_UNDEFINED 0x00 178#define UVC_VS_CONTROL_UNDEFINED 0x00
183#define UVC_VS_PROBE_CONTROL 0x01 179#define UVC_VS_PROBE_CONTROL 0x01
@@ -242,19 +238,6 @@ struct uvc_xu_control {
242 {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 238 {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
243 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02} 239 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02}
244 240
245#define UVC_GUID_LOGITECH_DEV_INFO \
246 {0x82, 0x06, 0x61, 0x63, 0x70, 0x50, 0xab, 0x49, \
247 0xb8, 0xcc, 0xb3, 0x85, 0x5e, 0x8d, 0x22, 0x1e}
248#define UVC_GUID_LOGITECH_USER_HW \
249 {0x82, 0x06, 0x61, 0x63, 0x70, 0x50, 0xab, 0x49, \
250 0xb8, 0xcc, 0xb3, 0x85, 0x5e, 0x8d, 0x22, 0x1f}
251#define UVC_GUID_LOGITECH_VIDEO \
252 {0x82, 0x06, 0x61, 0x63, 0x70, 0x50, 0xab, 0x49, \
253 0xb8, 0xcc, 0xb3, 0x85, 0x5e, 0x8d, 0x22, 0x50}
254#define UVC_GUID_LOGITECH_MOTOR \
255 {0x82, 0x06, 0x61, 0x63, 0x70, 0x50, 0xab, 0x49, \
256 0xb8, 0xcc, 0xb3, 0x85, 0x5e, 0x8d, 0x22, 0x56}
257
258#define UVC_GUID_FORMAT_MJPEG \ 241#define UVC_GUID_FORMAT_MJPEG \
259 { 'M', 'J', 'P', 'G', 0x00, 0x00, 0x10, 0x00, \ 242 { 'M', 'J', 'P', 'G', 0x00, 0x00, 0x10, 0x00, \
260 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} 243 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}