summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx.h
diff options
context:
space:
mode:
authorAidan Thornton <makosoft@googlemail.com>2008-04-17 21:40:36 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 14:09:41 -0300
commit3421b7787a2cf41ac5edce9b5766bddd1e1d9986 (patch)
tree365e77e9c81b6646bb8c865f981c3d12dc37556c /drivers/media/video/em28xx/em28xx.h
parent579f72e44fb1c991352f44c20b471c3001357f68 (diff)
V4L/DVB (7603): em28xx-dvb: don't use videobuf-dvb
Modifies em28xx-dvb not to use videobuf-dvb, but instead to include the code for registering dvb devices locally and use the URB management code in the em28xx driver directly. DVB data streaming should now work. Signed-off-by: Aidan Thornton <makosoft@googlemail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx.h')
-rw-r--r--drivers/media/video/em28xx/em28xx.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 151bc57bd08..e5fd2dc7735 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -422,11 +422,7 @@ struct em28xx {
enum em28xx_mode mode;
-#if defined(CONFIG_VIDEO_EM28XX_DVB) || defined(CONFIG_VIDEO_EM28XX_DVB_MODULE)
- struct videobuf_dvb dvb;
- struct videobuf_queue_ops *qops;
- struct em28xx_fh dvb_fh;
-#endif
+ struct em28xx_dvb *dvb;
};
struct em28xx_ops {