diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-14 11:40:51 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:23 -0400 |
commit | 9467fe126451c7fc7878d21f3cd1938421ef972e (patch) | |
tree | 298d0aebb8328829a4b41729e817ccc1fff9c298 /drivers/media/video/cx88/cx88.h | |
parent | 74fc7bd9cec0ccdbea23659208492ec7ffc58297 (diff) |
V4L/DVB (11047): cx88: convert to v4l2_device.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx88/cx88.h')
-rw-r--r-- | drivers/media/video/cx88/cx88.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index 303d8d20fc91..890018c48cd8 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <linux/videodev2.h> | 25 | #include <linux/videodev2.h> |
26 | #include <linux/kdev_t.h> | 26 | #include <linux/kdev_t.h> |
27 | 27 | ||
28 | #include <media/v4l2-common.h> | 28 | #include <media/v4l2-device.h> |
29 | #include <media/tuner.h> | 29 | #include <media/tuner.h> |
30 | #include <media/tveeprom.h> | 30 | #include <media/tveeprom.h> |
31 | #include <media/videobuf-dma-sg.h> | 31 | #include <media/videobuf-dma-sg.h> |
@@ -327,6 +327,7 @@ struct cx88_core { | |||
327 | u32 i2c_state, i2c_rc; | 327 | u32 i2c_state, i2c_rc; |
328 | 328 | ||
329 | /* config info -- analog */ | 329 | /* config info -- analog */ |
330 | struct v4l2_device v4l2_dev; | ||
330 | unsigned int boardnr; | 331 | unsigned int boardnr; |
331 | struct cx88_board board; | 332 | struct cx88_board board; |
332 | 333 | ||
@@ -365,6 +366,11 @@ struct cx88_core { | |||
365 | int active_fe_id; | 366 | int active_fe_id; |
366 | }; | 367 | }; |
367 | 368 | ||
369 | static inline struct cx88_core *to_core(struct v4l2_device *v4l2_dev) | ||
370 | { | ||
371 | return container_of(v4l2_dev, struct cx88_core, v4l2_dev); | ||
372 | } | ||
373 | |||
368 | struct cx8800_dev; | 374 | struct cx8800_dev; |
369 | struct cx8802_dev; | 375 | struct cx8802_dev; |
370 | 376 | ||