git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
exynos4412-odroid-common.dtsi
diff --git
a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index 78f118cb73d4c81a2dfe3c07db0b885d26552c37..0f1ff792fe44e62ceab0b1668d2de0fed55fabd4 100644
(file)
--- a/
arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/
arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@
-555,7
+555,3
@@
vtmu-supply = <&ldo10_reg>;
status = "okay";
};
-
-&watchdog {
- status = "okay";
-};