projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
armada-xp.dtsi
diff --git
a/arch/arm/boot/dts/armada-xp.dtsi
b/arch/arm/boot/dts/armada-xp.dtsi
index
0854d44
..
3de9b76
100644
(file)
--- a/
arch/arm/boot/dts/armada-xp.dtsi
+++ b/
arch/arm/boot/dts/armada-xp.dtsi
@@
-305,7
+305,7
@@
spi0_pins: spi0-pins {
marvell,pins = "mpp36", "mpp37",
"mpp38", "mpp39";
- marvell,function = "spi";
+ marvell,function = "spi
0
";
};
uart2_pins: uart2-pins {