diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-10-23 20:43:40 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-10-23 20:43:40 +0200 |
| commit | 91de76e661a266731fc2889a398ad1694df9d523 (patch) | |
| tree | ecc278f000f18e5b2b880f61ee4b0e68ebd1d6d4 /Documentation/devicetree/bindings/net/stm32-dwmac.txt | |
| parent | Input: edt-ft5x06 - implement support for the EDT-M12 series (diff) | |
| parent | Linux 4.14-rc6 (diff) | |
| download | linux-91de76e661a266731fc2889a398ad1694df9d523.tar.xz linux-91de76e661a266731fc2889a398ad1694df9d523.zip | |
Merge tag 'v4.14-rc6' into next
Merge with mainline to bring in the timer API changes.
Diffstat (limited to 'Documentation/devicetree/bindings/net/stm32-dwmac.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/net/stm32-dwmac.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/stm32-dwmac.txt b/Documentation/devicetree/bindings/net/stm32-dwmac.txt index c35afb7e956a..489dbcb66c5a 100644 --- a/Documentation/devicetree/bindings/net/stm32-dwmac.txt +++ b/Documentation/devicetree/bindings/net/stm32-dwmac.txt @@ -18,7 +18,6 @@ Example: ethernet@40028000 { compatible = "st,stm32-dwmac", "snps,dwmac-3.50a"; - status = "disabled"; reg = <0x40028000 0x8000>; reg-names = "stmmaceth"; interrupts = <0 61 0>, <0 62 0>; |