diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:15:23 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 13:13:31 +0200 |
| commit | 38c3b2455edea648f38d3e11baf478488fd698ed (patch) | |
| tree | a66280a235dfd3fdb5c0411f4efc64b2b98aec0c /Documentation | |
| parent | 5b7b7ee5d943c6b58d9b7f974167d0105ca1b787 (diff) | |
| parent | ca22ccd7cdbb6b2bd720dd7e14280ee1efa29074 (diff) | |
| download | barebox-38c3b2455edea648f38d3e11baf478488fd698ed.tar.gz barebox-38c3b2455edea648f38d3e11baf478488fd698ed.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
lib/Makefile
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/leds/common.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/leds/common.rst b/Documentation/devicetree/bindings/leds/common.rst index c1fd1ab89e..1f5ae42caf 100644 --- a/Documentation/devicetree/bindings/leds/common.rst +++ b/Documentation/devicetree/bindings/leds/common.rst @@ -8,3 +8,5 @@ Common leds properties * ``panic`` - LED turns on when barebox panics * ``net`` - LED indicates network activity +* ``label``: The label for this LED. If omitted, the label is taken + from the node name (excluding the unit address). |