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 tag 'at91-drivers' of git://github.com/at91linux/linux-at91 into next/drivers
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
at91sam9x25ek.dts
diff --git
a/arch/arm/boot/dts/at91sam9x25ek.dts
b/arch/arm/boot/dts/at91sam9x25ek.dts
index 315250b4995e74e4452af0d0e46bb847790fbaf5..494864836e837aa87de0b7d7f8fe46844cd788e7 100644
(file)
--- a/
arch/arm/boot/dts/at91sam9x25ek.dts
+++ b/
arch/arm/boot/dts/at91sam9x25ek.dts
@@
-7,8
+7,8
@@
* Licensed under GPLv2 or later.
*/
/dts-v1/;
-
/include/
"at91sam9x25.dtsi"
-
/include/
"at91sam9x5ek.dtsi"
+
#include
"at91sam9x25.dtsi"
+
#include
"at91sam9x5ek.dtsi"
/ {
model = "Atmel AT91SAM9X25-EK";