diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 15:41:02 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-25 15:41:02 -0500 |
| commit | 67635d397a643514fdfa859f611b86bd3ad8958d (patch) | |
| tree | b5df6d79b35cde39c00f0cc1432f128f473d4d6e /drivers/media/platform/coda.c | |
| parent | 192fef18d0f5ac9a05a93ff6314fc9865c10fbf9 (diff) | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
Merge 3.8-rc5 into usb-next
This fixes up a conflict with drivers/usb/serial/io_ti.c that came up in
linux-next.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media/platform/coda.c')
| -rw-r--r-- | drivers/media/platform/coda.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c index 1cf8293c0fb0..4a980e029ca7 100644 --- a/drivers/media/platform/coda.c +++ b/drivers/media/platform/coda.c | |||
| @@ -23,8 +23,8 @@ | |||
| 23 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 24 | #include <linux/videodev2.h> | 24 | #include <linux/videodev2.h> |
| 25 | #include <linux/of.h> | 25 | #include <linux/of.h> |
| 26 | #include <linux/platform_data/imx-iram.h> | ||
| 26 | 27 | ||
| 27 | #include <mach/iram.h> | ||
| 28 | #include <media/v4l2-ctrls.h> | 28 | #include <media/v4l2-ctrls.h> |
| 29 | #include <media/v4l2-device.h> | 29 | #include <media/v4l2-device.h> |
| 30 | #include <media/v4l2-ioctl.h> | 30 | #include <media/v4l2-ioctl.h> |