diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-08-14 10:14:12 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-08-14 10:14:12 (GMT) |
| commit | 397f09977ea350a20f20b415a9313cc790137742 (patch) | |
| tree | 0e44f2f3e5804bd5c0c6f644785006b7225e3c94 /drivers/media/platform/coda.c | |
| parent | 6356bb0ad6525dae93c06478a098ed3848e9ab01 (diff) | |
| parent | a4b4bedce880046feeb5b206392960f395ed02ad (diff) | |
| download | linux-fsl-qoriq-397f09977ea350a20f20b415a9313cc790137742.tar.xz | |
Merge tag 'amd_f15_m30' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/ras
Pull AMD F15h, model 0x30 and later enablement stuff, more specifically EDAC
support, from Borislav Petkov.
Signed-off-by: Ingo Molnar <mingo@kernel.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 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 */ } }; |