projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[linux-2.6-block.git]
/
arch
/
arm
/
boot
/
dts
/
kirkwood-sheevaplug-common.dtsi
diff --git
a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
index f55a145ec52e3833c86c5a821ff2a2112db19fc3..5696b630b70bb0c19fb0d4bc38b17342cd5a5228 100644
(file)
--- a/
arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
+++ b/
arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
@@
-6,8
+6,8
@@
* Licensed under GPLv2
*/
-
/include/
"kirkwood.dtsi"
-
/include/
"kirkwood-6281.dtsi"
+
#include
"kirkwood.dtsi"
+
#include
"kirkwood-6281.dtsi"
/ {
memory {