projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-v3.11' of git://git.infradead.org/battery-2.6
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
at91sam9g15ek.dts
diff --git
a/arch/arm/boot/dts/at91sam9g15ek.dts
b/arch/arm/boot/dts/at91sam9g15ek.dts
index
5427b2d
..
26b0444
100644
(file)
--- a/
arch/arm/boot/dts/at91sam9g15ek.dts
+++ b/
arch/arm/boot/dts/at91sam9g15ek.dts
@@
-7,8
+7,8
@@
* Licensed under GPLv2 or later.
*/
/dts-v1/;
-
/include/
"at91sam9g15.dtsi"
-
/include/
"at91sam9x5ek.dtsi"
+
#include
"at91sam9g15.dtsi"
+
#include
"at91sam9x5ek.dtsi"
/ {
model = "Atmel AT91SAM9G15-EK";