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 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo...
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
rv1108.dtsi
diff --git
a/arch/arm/boot/dts/rv1108.dtsi
b/arch/arm/boot/dts/rv1108.dtsi
index
a1a08cb
..
e491964
100644
(file)
--- a/
arch/arm/boot/dts/rv1108.dtsi
+++ b/
arch/arm/boot/dts/rv1108.dtsi
@@
-299,7
+299,7
@@
clock-names = "timer", "pclk";
};
clock-names = "timer", "pclk";
};
- watchdog: w
dt
@10360000 {
+ watchdog: w
atchdog
@10360000 {
compatible = "snps,dw-wdt";
reg = <0x10360000 0x100>;
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
compatible = "snps,dw-wdt";
reg = <0x10360000 0x100>;
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;