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 remote-tracking branch 'asoc/fix/intel' into asoc-linus
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
aspeed-g4.dtsi
diff --git
a/arch/arm/boot/dts/aspeed-g4.dtsi
b/arch/arm/boot/dts/aspeed-g4.dtsi
index 45d815a86d420b9f8f108919bb846f865f9b5231..de08d9045cb85bd83884b8a7c05d78296034a94b 100644
(file)
--- a/
arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/
arch/arm/boot/dts/aspeed-g4.dtsi
@@
-219,7
+219,7
@@
compatible = "aspeed,ast2400-vuart";
reg = <0x1e787000 0x40>;
reg-shift = <2>;
- interrupts = <
10
>;
+ interrupts = <
8
>;
clocks = <&clk_uart>;
no-loopback-test;
status = "disabled";