From b1acbfcb05eeb752cfb709fe1ed4d5edca80f999 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Sun, 25 Nov 2007 19:04:47 -0300 Subject: [PATCH] --- yaml --- r: 76474 b: refs/heads/master c: 4c5efc1778387de98d5348666e7bc4396c9a5404 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/DocBook/videobook.tmpl | 9 --------- trunk/drivers/media/video/usbvision/usbvision.h | 4 ---- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/[refs] b/[refs] index d9bf4dd49893..a437457164a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c23f5949c0eeec328c872f29c8f4c233e73c3c4d +refs/heads/master: 4c5efc1778387de98d5348666e7bc4396c9a5404 diff --git a/trunk/Documentation/DocBook/videobook.tmpl b/trunk/Documentation/DocBook/videobook.tmpl index b629da33951d..b3d93ee27693 100644 --- a/trunk/Documentation/DocBook/videobook.tmpl +++ b/trunk/Documentation/DocBook/videobook.tmpl @@ -96,7 +96,6 @@ static struct video_device my_radio { "My radio", VID_TYPE_TUNER, - VID_HARDWARE_MYRADIO, radio_open. radio_close, NULL, /* no read */ @@ -118,13 +117,6 @@ static struct video_device my_radio indicates that the device can be tuned. Clearly our radio is going to have some way to change channel so it is tuneable. - - The VID_HARDWARE_ types are unique to each device. Numbers are assigned by - alan@redhat.com when device drivers are going to be released. Until then you - can pull a suitably large number out of your hat and use it. 10000 should be - safe for a very long time even allowing for the huge number of vendors - making new and different radio cards at the moment. - We declare an open and close routine, but we do not need read or write, which are used to read and write video data to or from the card itself. As @@ -844,7 +836,6 @@ static struct video_device my_camera "My Camera", VID_TYPE_OVERLAY|VID_TYPE_SCALES|\ VID_TYPE_CAPTURE|VID_TYPE_CHROMAKEY, - VID_HARDWARE_MYCAMERA, camera_open. camera_close, camera_read, /* no read */ diff --git a/trunk/drivers/media/video/usbvision/usbvision.h b/trunk/drivers/media/video/usbvision/usbvision.h index c32f68566bf9..dd80a98780f2 100644 --- a/trunk/drivers/media/video/usbvision/usbvision.h +++ b/trunk/drivers/media/video/usbvision/usbvision.h @@ -41,10 +41,6 @@ #define USBVISION_DEBUG /* Turn on debug messages */ -#ifndef VID_HARDWARE_USBVISION - #define VID_HARDWARE_USBVISION 34 /* USBVision Video Grabber */ -#endif - #define USBVISION_PWR_REG 0x00 #define USBVISION_SSPND_EN (1 << 1) #define USBVISION_RES2 (1 << 2)