git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
devices
/
platform-imx-fb.c
diff --git
a/arch/arm/mach-imx/devices/platform-imx-fb.c
b/arch/arm/mach-imx/devices/platform-imx-fb.c
index
10b0ed3
..
25a47c6
100644
(file)
--- a/
arch/arm/mach-imx/devices/platform-imx-fb.c
+++ b/
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));
}