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 branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
bcm2836-rpi-2-b.dts
diff --git
a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
index c4743f42237be14b0526bbe77b2724bff09ab963..29e1cfe8eb142bd1af81e5b1869b8c406c46ad0b 100644
(file)
--- a/
arch/arm/boot/dts/bcm2836-rpi-2-b.dts
+++ b/
arch/arm/boot/dts/bcm2836-rpi-2-b.dts
@@
-1,6
+1,7
@@
/dts-v1/;
#include "bcm2836.dtsi"
#include "bcm2835-rpi.dtsi"
+#include "bcm283x-rpi-smsc9514.dtsi"
/ {
compatible = "raspberrypi,2-model-b", "brcm,bcm2836";