summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/bcm958625hr.dts
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-12-17 04:11:55 +0100
committerDavid S. Miller <davem@davemloft.net>2017-12-17 04:11:55 +0100
commitc30abd5e40dd863f88e26be09b6ce949145a630a (patch)
tree5b25362084308502a336d8da26b8dc7430d7c812 /arch/arm/boot/dts/bcm958625hr.dts
parentnet: phy: broadcom: Add entry for 5395 switch PHYs (diff)
parentMerge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma (diff)
downloadlinux-c30abd5e40dd863f88e26be09b6ce949145a630a.tar.xz
linux-c30abd5e40dd863f88e26be09b6ce949145a630a.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three sets of overlapping changes, two in the packet scheduler and one in the meson-gxl PHY driver. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/boot/dts/bcm958625hr.dts')
-rw-r--r--arch/arm/boot/dts/bcm958625hr.dts4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts
index d94d14b3c745..6a44b8021702 100644
--- a/arch/arm/boot/dts/bcm958625hr.dts
+++ b/arch/arm/boot/dts/bcm958625hr.dts
@@ -177,10 +177,6 @@
status = "okay";
};
-&sata {
- status = "okay";
-};
-
&srab {
compatible = "brcm,bcm58625-srab", "brcm,nsp-srab";
status = "okay";