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 'for-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux...
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
net
/
wireless
/
brcm,bcm43xx-fmac.txt
diff --git
a/Documentation/devicetree/bindings/net/wireless/brcm,bcm43xx-fmac.txt
b/Documentation/devicetree/bindings/net/wireless/brcm,bcm43xx-fmac.txt
index 5dbf169cd81c864a20c22f57fccef3a25a12bb58..590f622188de8874586a1b11772f82c4f17f100c 100644
(file)
--- a/
Documentation/devicetree/bindings/net/wireless/brcm,bcm43xx-fmac.txt
+++ b/
Documentation/devicetree/bindings/net/wireless/brcm,bcm43xx-fmac.txt
@@
-31,7
+31,7
@@
mmc3: mmc@01c12000 {
non-removable;
status = "okay";
- brcmf:
bcrmf
@1 {
+ brcmf:
wifi
@1 {
reg = <1>;
compatible = "brcm,bcm4329-fmac";
interrupt-parent = <&pio>;