projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
imx50.dtsi
diff --git
a/arch/arm/boot/dts/imx50.dtsi
b/arch/arm/boot/dts/imx50.dtsi
index
b6b2e6a
..
a969f33
100644
(file)
--- a/
arch/arm/boot/dts/imx50.dtsi
+++ b/
arch/arm/boot/dts/imx50.dtsi
@@
-267,7
+267,7
@@
<&iomuxc 20 140 11>;
};
- wdog1: wdog@53f98000 {
+ wdog1: w
atch
dog@53f98000 {
compatible = "fsl,imx50-wdt", "fsl,imx21-wdt";
reg = <0x53f98000 0x4000>;
interrupts = <58>;