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 'regulator/topic/core' into regulator-next
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
ste-nomadik-s8815.dts
diff --git
a/arch/arm/boot/dts/ste-nomadik-s8815.dts
b/arch/arm/boot/dts/ste-nomadik-s8815.dts
index f557feb997f46ff449df70859c0a3e3cf367c226..90d8b6c7a20506ee81e9e5258e0d4522d8cfeba8 100644
(file)
--- a/
arch/arm/boot/dts/ste-nomadik-s8815.dts
+++ b/
arch/arm/boot/dts/ste-nomadik-s8815.dts
@@
-4,7
+4,7
@@
*/
/dts-v1/;
-
/include/
"ste-nomadik-stn8815.dtsi"
+
#include
"ste-nomadik-stn8815.dtsi"
/ {
model = "Calao Systems USB-S8815";