diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-22 09:22:12 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-22 09:22:12 +0100 |
| commit | b2555b877bf9faf7045ae362ca051590e79167cf (patch) | |
| tree | a4dfbc40f93be0c2668bbe51541c8a26f16f44dd /drivers | |
| parent | Merge branch 'v3.8-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | [media] coda: Fix build due to iram.h rename (diff) | |
| download | linux-b2555b877bf9faf7045ae362ca051590e79167cf.tar.xz linux-b2555b877bf9faf7045ae362ca051590e79167cf.zip | |
Merge tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
From Sascha Hauer:
ARM i.MX fixes for -rc.
This contains a single compilation fix for the CODA driver.
* tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6:
[media] coda: Fix build due to iram.h rename
Diffstat (limited to 'drivers')
| -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 @@ #include <linux/slab.h> #include <linux/videodev2.h> #include <linux/of.h> +#include <linux/platform_data/imx-iram.h> -#include <mach/iram.h> #include <media/v4l2-ctrls.h> #include <media/v4l2-device.h> #include <media/v4l2-ioctl.h> |