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/cpia.c | |
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/cpia.c')
-rw-r--r-- | drivers/media/video/cpia.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c index a1d02e5ce0fd..7c630f5ee725 100644 --- a/drivers/media/video/cpia.c +++ b/drivers/media/video/cpia.c | |||
@@ -65,10 +65,6 @@ MODULE_PARM_DESC(colorspace_conv, | |||
65 | 65 | ||
66 | #define ABOUT "V4L-Driver for Vision CPiA based cameras" | 66 | #define ABOUT "V4L-Driver for Vision CPiA based cameras" |
67 | 67 | ||
68 | #ifndef VID_HARDWARE_CPIA | ||
69 | #define VID_HARDWARE_CPIA 24 /* FIXME -> from linux/videodev.h */ | ||
70 | #endif | ||
71 | |||
72 | #define CPIA_MODULE_CPIA (0<<5) | 68 | #define CPIA_MODULE_CPIA (0<<5) |
73 | #define CPIA_MODULE_SYSTEM (1<<5) | 69 | #define CPIA_MODULE_SYSTEM (1<<5) |
74 | #define CPIA_MODULE_VP_CTRL (5<<5) | 70 | #define CPIA_MODULE_VP_CTRL (5<<5) |
@@ -3804,7 +3800,6 @@ static struct video_device cpia_template = { | |||
3804 | .owner = THIS_MODULE, | 3800 | .owner = THIS_MODULE, |
3805 | .name = "CPiA Camera", | 3801 | .name = "CPiA Camera", |
3806 | .type = VID_TYPE_CAPTURE, | 3802 | .type = VID_TYPE_CAPTURE, |
3807 | .hardware = VID_HARDWARE_CPIA, | ||
3808 | .fops = &cpia_fops, | 3803 | .fops = &cpia_fops, |
3809 | }; | 3804 | }; |
3810 | 3805 | ||