From d9dd8bf70b04d0341c29229bdf4a4b3e8a1a2193 Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Sun, 13 Jan 2013 16:56:42 +0100 Subject: [PATCH] --- yaml --- r: 349094 b: refs/heads/master c: 006e792ba5f60c59d8bc5ac5628c54e021e8580f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/devices/platform-imx-fb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f92372764198..4767a6b313f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aec99b7bda06436cd95229fe4841aeef29112e11 +refs/heads/master: 006e792ba5f60c59d8bc5ac5628c54e021e8580f diff --git a/trunk/arch/arm/mach-imx/devices/platform-imx-fb.c b/trunk/arch/arm/mach-imx/devices/platform-imx-fb.c index 10b0ed39f07f..25a47c616b2d 100644 --- a/trunk/arch/arm/mach-imx/devices/platform-imx-fb.c +++ b/trunk/arch/arm/mach-imx/devices/platform-imx-fb.c @@ -54,7 +54,7 @@ struct platform_device *__init imx_add_imx_fb( .flags = IORESOURCE_IRQ, }, }; - return imx_add_platform_device_dmamask("imx-fb", 0, + return imx_add_platform_device_dmamask(data->devid, 0, res, ARRAY_SIZE(res), pdata, sizeof(*pdata), DMA_BIT_MASK(32)); }