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' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx3
/
mach-pcm043.c
diff --git
a/arch/arm/mach-mx3/mach-pcm043.c
b/arch/arm/mach-mx3/mach-pcm043.c
index
1bf1ec2
..
78d9185
100644
(file)
--- a/
arch/arm/mach-mx3/mach-pcm043.c
+++ b/
arch/arm/mach-mx3/mach-pcm043.c
@@
-150,6
+150,7
@@
static struct i2c_board_info pcm043_i2c_devices[] = {
static struct platform_device *devices[] __initdata = {
&pcm043_flash,
&mxc_fec_device,
+ &imx_wdt_device0,
};
static struct pad_desc pcm043_pads[] = {