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 branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
ste-hrefprev60.dtsi
diff --git
a/arch/arm/boot/dts/ste-hrefprev60.dtsi
b/arch/arm/boot/dts/ste-hrefprev60.dtsi
index 3f14b4df69b4e4d1ab27bd821eaeeb8d819ef40f..94eeb7f1c947863956561ce5e507bcbc75574bbb 100644
(file)
--- a/
arch/arm/boot/dts/ste-hrefprev60.dtsi
+++ b/
arch/arm/boot/dts/ste-hrefprev60.dtsi
@@
-57,7
+57,7
@@
};
};
- s
sp
@80002000 {
+ s
pi
@80002000 {
/*
* On the first generation boards, this SSP/SPI port was connected
* to the AB8500.