git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[safe/jmp/linux-2.6]
/
arch
/
arm
/
mach-mx3
/
mach-pcm037.c
diff --git
a/arch/arm/mach-mx3/mach-pcm037.c
b/arch/arm/mach-mx3/mach-pcm037.c
index
78ecd75
..
cce4106
100644
(file)
--- a/
arch/arm/mach-mx3/mach-pcm037.c
+++ b/
arch/arm/mach-mx3/mach-pcm037.c
@@
-449,6
+449,7
@@
static int __init pcm037_camera_alloc_dma(const size_t buf_size)
static struct platform_device *devices[] __initdata = {
&pcm037_flash,
&pcm037_sram_device,
+ &imx_wdt_device0,
&pcm037_mt9t031,
&pcm037_mt9v022,
};