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/i2c/cx25840/cx25840-firmware.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/i2c/cx25840/cx25840-firmware.c')
| -rw-r--r-- | drivers/media/i2c/cx25840/cx25840-firmware.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/i2c/cx25840/cx25840-firmware.c b/drivers/media/i2c/cx25840/cx25840-firmware.c index 9bbb31adc29d..37e052923a87 100644 --- a/drivers/media/i2c/cx25840/cx25840-firmware.c +++ b/drivers/media/i2c/cx25840/cx25840-firmware.c @@ -19,7 +19,7 @@ #include <linux/i2c.h> #include <linux/firmware.h> #include <media/v4l2-common.h> -#include <media/cx25840.h> +#include <media/drv-intf/cx25840.h> #include "cx25840-core.h" |