projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
[linux-2.6]
/
arch
/
arm
/
mach-mx1
/
devices.c
diff --git
a/arch/arm/mach-mx1/devices.c
b/arch/arm/mach-mx1/devices.c
index
97f42d9
..
76d1ffb
100644
(file)
--- a/
arch/arm/mach-mx1/devices.c
+++ b/
arch/arm/mach-mx1/devices.c
@@
-44,7
+44,7
@@
static struct resource imx_csi_resources[] = {
static u64 imx_csi_dmamask = 0xffffffffUL;
struct platform_device imx_csi_device = {
- .name = "
imx-csi
",
+ .name = "
mx1-camera
",
.id = 0, /* This is used to put cameras on this interface */
.dev = {
.dma_mask = &imx_csi_dmamask,