diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-15 11:09:17 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-22 10:01:24 -0400 |
commit | 22c4a4e98ece0eaff13b3d0ac73c5283013eb6b1 (patch) | |
tree | 4be32c9940460580decfd692e7de78dc21058e64 /drivers/media/video/cpia2 | |
parent | 786e9d4c3fdc3c913f1a735bcb979bfd62b275be (diff) |
V4L/DVB (6320): v4l core: remove the unused .hardware V4L1 field
struct video_device used to define a .hardware field. While
initialized on severl drivers, this field is never used inside V4L.
However, drivers using it need to include the old V4L1 header.
This seems to cause compilation troubles with some random configs.
Better just to remove it from all drivers.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cpia2')
-rw-r--r-- | drivers/media/video/cpia2/cpia2_v4l.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c index e3aaba1e0e0a..e378abec806d 100644 --- a/drivers/media/video/cpia2/cpia2_v4l.c +++ b/drivers/media/video/cpia2/cpia2_v4l.c | |||
@@ -86,10 +86,6 @@ MODULE_LICENSE("GPL"); | |||
86 | 86 | ||
87 | #define ABOUT "V4L-Driver for Vision CPiA2 based cameras" | 87 | #define ABOUT "V4L-Driver for Vision CPiA2 based cameras" |
88 | 88 | ||
89 | #ifndef VID_HARDWARE_CPIA2 | ||
90 | #error "VID_HARDWARE_CPIA2 should have been defined in linux/videodev.h" | ||
91 | #endif | ||
92 | |||
93 | struct control_menu_info { | 89 | struct control_menu_info { |
94 | int value; | 90 | int value; |
95 | char name[32]; | 91 | char name[32]; |
@@ -1942,7 +1938,6 @@ static struct video_device cpia2_template = { | |||
1942 | .type= VID_TYPE_CAPTURE, | 1938 | .type= VID_TYPE_CAPTURE, |
1943 | .type2 = V4L2_CAP_VIDEO_CAPTURE | | 1939 | .type2 = V4L2_CAP_VIDEO_CAPTURE | |
1944 | V4L2_CAP_STREAMING, | 1940 | V4L2_CAP_STREAMING, |
1945 | .hardware= VID_HARDWARE_CPIA2, | ||
1946 | .minor= -1, | 1941 | .minor= -1, |
1947 | .fops= &fops_template, | 1942 | .fops= &fops_template, |
1948 | .release= video_device_release, | 1943 | .release= video_device_release, |