aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/versatile-pb.dts
diff options
context:
space:
mode:
authorGravatar David S. Miller <davem@davemloft.net> 2014-03-05 20:32:02 -0500
committerGravatar David S. Miller <davem@davemloft.net> 2014-03-05 20:32:02 -0500
commit67ddc87f162e2d0e29db2b6b21c5a3fbcb8be206 (patch)
treec83ac73e3d569156d4b7f3dab3e7e27e0054cd0d /arch/arm/boot/dts/versatile-pb.dts
parentieee802154: fix whitespace issues in Kconfig (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadlinux-67ddc87f162e2d0e29db2b6b21c5a3fbcb8be206.tar.gz
linux-67ddc87f162e2d0e29db2b6b21c5a3fbcb8be206.tar.bz2
linux-67ddc87f162e2d0e29db2b6b21c5a3fbcb8be206.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/mwifiex/pcie.c net/ipv6/sit.c The SIT driver conflict consists of a bug fix being done by hand in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper was created (netdev_alloc_pcpu_stats()) which takes care of this. The two wireless conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/boot/dts/versatile-pb.dts')
-rw-r--r--arch/arm/boot/dts/versatile-pb.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/versatile-pb.dts b/arch/arm/boot/dts/versatile-pb.dts
index f43907c40c93..65f657711323 100644
--- a/arch/arm/boot/dts/versatile-pb.dts
+++ b/arch/arm/boot/dts/versatile-pb.dts
@@ -1,4 +1,4 @@
-/include/ "versatile-ab.dts"
+#include <versatile-ab.dts>
/ {
model = "ARM Versatile PB";
@@ -47,4 +47,4 @@
};
};
-/include/ "testcases/tests.dtsi"
+#include <testcases.dtsi>