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 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx2
/
mach-pcm038.c
diff --git
a/arch/arm/mach-mx2/mach-pcm038.c
b/arch/arm/mach-mx2/mach-pcm038.c
index
035fbe0
..
36c8943
100644
(file)
--- a/
arch/arm/mach-mx2/mach-pcm038.c
+++ b/
arch/arm/mach-mx2/mach-pcm038.c
@@
-182,6
+182,7
@@
static struct platform_device *platform_devices[] __initdata = {
&mxc_w1_master_device,
&mxc_fec_device,
&pcm038_sram_mtd_device,
+ &mxc_wdt,
};
/* On pcm038 there's a sram attached to CS1, we enable the chipselect here and