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 branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'x86/vt-d', 'x86/amd', ...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
am335x-boneblack.dts
diff --git
a/arch/arm/boot/dts/am335x-boneblack.dts
b/arch/arm/boot/dts/am335x-boneblack.dts
index 5c42d259fa68fbf29c98439306badd1d44987ee0..901739fcb85a37abba32822463caea432637d274 100644
(file)
--- a/
arch/arm/boot/dts/am335x-boneblack.dts
+++ b/
arch/arm/boot/dts/am335x-boneblack.dts
@@
-80,7
+80,3
@@
status = "okay";
};
};
-
-&rtc {
- system-power-controller;
-};