diff options
| author | Jon Medhurst <tixy@linaro.org> | 2016-07-13 09:13:49 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2016-07-13 09:13:49 +0100 |
| commit | bb2a9cfa22eb0afe2cb2161efe6c8bc46d01542f (patch) | |
| tree | 113de6457f414e40ff6a83d33fff2797f951788c | |
| parent | 04e565da521b7940bbbe69ef932010be3a66e97a (diff) | |
| parent | 57e63979bbcb3926f46992a3bc82e0f6903f8192 (diff) | |
Merge branch 'lsk-3.18-armlt-misc' into lsk-3.18-armltlsk-3.18-armlt-20160713
| -rw-r--r-- | arch/arm64/boot/dts/arm/juno-r1.dts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts index 2328e5f197aa..9ce6a46db2ff 100644 --- a/arch/arm64/boot/dts/arm/juno-r1.dts +++ b/arch/arm64/boot/dts/arm/juno-r1.dts @@ -231,3 +231,7 @@ &pcie_ctlr { status = "okay"; }; + +&smsc_ethernet { + status = "disabled"; +}; |