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 tag 'pm-extra-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
mt6589.dtsi
diff --git
a/arch/arm/boot/dts/mt6589.dtsi
b/arch/arm/boot/dts/mt6589.dtsi
index 88b3cb128698fb9d2e0abf9cfc46134b4538477e..0d6f60af76402f5de54b7ecea8add726d85b31b0 100644
(file)
--- a/
arch/arm/boot/dts/mt6589.dtsi
+++ b/
arch/arm/boot/dts/mt6589.dtsi
@@
-102,7
+102,7
@@
#interrupt-cells = <3>;
interrupt-parent = <&gic>;
reg = <0x10211000 0x1000>,
- <0x10212000 0x
1
000>,
+ <0x10212000 0x
2
000>,
<0x10214000 0x2000>,
<0x10216000 0x2000>;
};