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 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
at91sam9260.dtsi
diff --git
a/arch/arm/boot/dts/at91sam9260.dtsi
b/arch/arm/boot/dts/at91sam9260.dtsi
index 62d25b14deb8a6916ddbeb6116b25ba71a7e31ba..d88fe62a2b2e12e41aaeb8058d028b7fa89cd788 100644
(file)
--- a/
arch/arm/boot/dts/at91sam9260.dtsi
+++ b/
arch/arm/boot/dts/at91sam9260.dtsi
@@
-753,7
+753,7
@@
};
dbgu: serial@fffff200 {
- compatible = "atmel,at91sam9260-usart";
+ compatible = "atmel,at91sam9260-
dbgu", "atmel,at91sam9260-
usart";
reg = <0xfffff200 0x200>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
pinctrl-names = "default";