aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-06-02 15:20:17 (GMT)
committerJohn W. Linville <linville@tuxdriver.com>2014-06-02 15:20:17 (GMT)
commitfcb2c0d6cf75750e2912b09a3d0a782c90e2b1a0 (patch)
treea17982638b066ae29f8ab1a6e37f18e6dddb5272 /Documentation/devicetree/bindings/net
parent96b2e73c5471542cb9c622c4360716684f8797ed (diff)
parenta715c7ddd65a1a3b2839b8ebd759bb2d361f7675 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'Documentation/devicetree/bindings/net')
-rw-r--r--Documentation/devicetree/bindings/net/nfc/st21nfca.txt2
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 4724fe6..e4faa2e 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

Privacy Policy