projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
k2e.dtsi
diff --git
a/arch/arm/boot/dts/k2e.dtsi
b/arch/arm/boot/dts/k2e.dtsi
index
5fc1468
..
50e555e
100644
(file)
--- a/
arch/arm/boot/dts/k2e.dtsi
+++ b/
arch/arm/boot/dts/k2e.dtsi
@@
-130,6
+130,7
@@
<GIC_SPI 376 IRQ_TYPE_EDGE_RISING>;
};
};
+ /include/ "k2e-netcp.dtsi"
};
};