diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2013-08-21 12:44:54 (GMT) |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2013-08-21 12:44:54 (GMT) |
commit | fac778a2b8d6ca953d440baeee72901c2dd5aad9 (patch) | |
tree | c43d780b5ff8819f4353b16c99601c5ceeeacad7 /drivers/media/platform/coda.c | |
parent | 07862c1cd6675cde2dd4bd64e64d704ea2185b79 (diff) | |
parent | 94fc5d9de5bd757ad46f0d94bc4ebf617c4487f6 (diff) | |
download | linux-fsl-qoriq-fac778a2b8d6ca953d440baeee72901c2dd5aad9.tar.xz |
Merge branch 'linus' into timers/core
Reason: Get upstream changes on which new patches depend on.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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 df4ada88..bd9405d 100644 --- a/drivers/media/platform/coda.c +++ b/drivers/media/platform/coda.c @@ -1987,7 +1987,7 @@ MODULE_DEVICE_TABLE(platform, coda_platform_ids); #ifdef CONFIG_OF static const struct of_device_id coda_dt_ids[] = { - { .compatible = "fsl,imx27-vpu", .data = &coda_platform_ids[CODA_IMX27] }, + { .compatible = "fsl,imx27-vpu", .data = &coda_devdata[CODA_IMX27] }, { .compatible = "fsl,imx53-vpu", .data = &coda_devdata[CODA_IMX53] }, { /* sentinel */ } }; |