diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-06-02 17:20:17 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-06-02 17:20:17 +0200 |
| commit | fcb2c0d6cf75750e2912b09a3d0a782c90e2b1a0 (patch) | |
| tree | a17982638b066ae29f8ab1a6e37f18e6dddb5272 /Documentation | |
| parent | Revert "net/mlx4_en: Use affinity hint" (diff) | |
| parent | wil6210: improve debug for WMI receive (diff) | |
| download | linux-fcb2c0d6cf75750e2912b09a3d0a782c90e2b1a0.tar.xz linux-fcb2c0d6cf75750e2912b09a3d0a782c90e2b1a0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/net/nfc/st21nfca.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/nfc/st21nfca.txt b/Documentation/devicetree/bindings/net/nfc/st21nfca.txt index 4724fe669172..e4faa2e8dfeb 100644 --- a/Documentation/devicetree/bindings/net/nfc/st21nfca.txt +++ b/Documentation/devicetree/bindings/net/nfc/st21nfca.txt @@ -1,7 +1,7 @@ * STMicroelectronics SAS. ST21NFCA NFC Controller Required properties: -- compatible: Should be "st,st21nfca-i2c". +- compatible: Should be "st,st21nfca_i2c". - clock-frequency: I²C work frequency. - reg: address on the bus - interrupt-parent: phandle for the interrupt gpio controller |