Skip to content

Commit

Permalink
[media] coda: Fix build due to iram.h rename
Browse files Browse the repository at this point in the history
commit c045e3f (ARM: imx: include iram.h rather than mach/iram.h) changed the
location of iram.h, which causes the following build error when building the coda
driver:

drivers/media/platform/coda.c:27:23: error: mach/iram.h: No such file or directory
drivers/media/platform/coda.c: In function 'coda_probe':
drivers/media/platform/coda.c:2000: error: implicit declaration of function 'iram_alloc'
drivers/media/platform/coda.c:2001: warning: assignment makes pointer from integer without a cast
drivers/media/platform/coda.c: In function 'coda_remove':
drivers/media/platform/coda.c:2024: error: implicit declaration of function 'iram_free'

Since the content of iram.h is not imx specific, move it to
include/linux/platform_data/imx-iram.h instead. This is an intermediate solution
until the i.MX iram allocator is converted to the generic SRAM allocator.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Sascha Hauer committed Jan 8, 2013
1 parent d1c3ed6 commit e909c68
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions arch/arm/mach-imx/iram_alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
#include <linux/module.h>
#include <linux/spinlock.h>
#include <linux/genalloc.h>

#include "iram.h"
#include "linux/platform_data/imx-iram.h"

static unsigned long iram_phys_base;
static void __iomem *iram_virt_base;
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/coda.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
File renamed without changes.

0 comments on commit e909c68

Please sign in to comment.