diff options
| author | Devin Heitmueller <dheitmueller@kernellabs.com> | 2013-01-04 16:16:24 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-01-05 01:03:38 -0200 |
| commit | d3829fadc4611e96aa360b8ead5adefdf61f45ea (patch) | |
| tree | 338ec2c07da5b7eb30465768b1814667150e9600 /drivers/media/usb/em28xx/em28xx-dvb.c | |
| parent | 2a221d34b646c7e1f44a1b1d8af4eee18015fbda (diff) | |
[media] em28xx: convert to videobuf2
This patch converts the em28xx driver over to videobuf2. It is
likely that em28xx_fh can go away entirely, but that will come in
a separate patch.
[mchehab@redhat.com: fix a non-trivial merge conflict with some VBI
patches; CodingStyle fixes]
Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx-dvb.c')
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx-dvb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c index a70b19e07e37..01bb8006f659 100644 --- a/drivers/media/usb/em28xx/em28xx-dvb.c +++ b/drivers/media/usb/em28xx/em28xx-dvb.c @@ -27,7 +27,9 @@ #include "em28xx.h" #include <media/v4l2-common.h> -#include <media/videobuf-vmalloc.h> +#include <dvb_demux.h> +#include <dvb_net.h> +#include <dmxdev.h> #include <media/tuner.h> #include "tuner-simple.h" #include <linux/gpio.h> |