git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'tiny/no-advice-fixup-3.18' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
net
/
nfc
/
st21nfcb.txt
diff --git
a/Documentation/devicetree/bindings/net/nfc/st21nfcb.txt
b/Documentation/devicetree/bindings/net/nfc/st21nfcb.txt
index 3b58ae4803445da5c1066159dc67577bec9f6cb4..9005608cbbd1e7fe1683b15ce8fcc6bbd7b43586 100644
(file)
--- a/
Documentation/devicetree/bindings/net/nfc/st21nfcb.txt
+++ b/
Documentation/devicetree/bindings/net/nfc/st21nfcb.txt
@@
-26,7
+26,7
@@
Example (for ARM-based BeagleBoard xM with ST21NFCB on I2C2):
clock-frequency = <400000>;
interrupt-parent = <&gpio5>;
- interrupts = <2 IRQ_TYPE_LEVEL_
LOW
>;
+ interrupts = <2 IRQ_TYPE_LEVEL_
HIGH
>;
reset-gpios = <&gpio5 29 GPIO_ACTIVE_HIGH>;
};