diff options
| author | David S. Miller <davem@davemloft.net> | 2016-01-13 06:22:13 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-13 06:22:13 +0100 |
| commit | 725da8dee445662beea77d3f42c3f4c79f7a7a0e (patch) | |
| tree | be1e2bd103c69d7bbace3fffd97bc3d714bbc3d7 /drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux (diff) | |
| download | linux-725da8dee445662beea77d3f42c3f4c79f7a7a0e.tar.xz linux-725da8dee445662beea77d3f42c3f4c79f7a7a0e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c')
| -rw-r--r-- | drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c b/drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c index 1a81aa70509b..7d675fae1846 100644 --- a/drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c @@ -32,7 +32,7 @@ #include "pvrusb2-hdw-internal.h" #include "pvrusb2-debug.h" -#include <media/cx25840.h> +#include <media/drv-intf/cx25840.h> #include <linux/videodev2.h> #include <media/v4l2-common.h> #include <linux/errno.h> |