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 git://git.infradead.org/intel-iommu
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
omap3-n950-n9.dtsi
diff --git
a/arch/arm/boot/dts/omap3-n950-n9.dtsi
b/arch/arm/boot/dts/omap3-n950-n9.dtsi
index c41db94ee9c2749c34a99df9915f7da03ed7a020..800b379d368d54ca901fa25c1ab789287d6a30a0 100644
(file)
--- a/
arch/arm/boot/dts/omap3-n950-n9.dtsi
+++ b/
arch/arm/boot/dts/omap3-n950-n9.dtsi
@@
-8,7
+8,7
@@
* published by the Free Software Foundation.
*/
-#include "omap36xx
-hs
.dtsi"
+#include "omap36xx.dtsi"
/ {
cpus {