diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-08 22:11:16 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-08 22:11:16 -0800 |
| commit | 4058f76247b29978352339fb6278bed796dd210f (patch) | |
| tree | 9e1ed94202374acbd32dc5dd7b1162ea198c6b0f /drivers/net/Kconfig | |
| parent | 614cd4a4ac3daf725508e372bce2160e2d8039a9 (diff) | |
| parent | 735ea23c4868bf3123a4c79184e9206e0cc60211 (diff) | |
Merge tag 'bcm-for-3.14-pinctrl-reduced-rename' of git://github.com/broadcom/bcm11351 into fixes
Merge 'bcm pinctrl rename' From Christin Daudt:
Rename pinctrl dt binding to restore consistency with other bcm mobile
bindings.
* tag 'bcm-for-3.14-pinctrl-reduced-rename' of git://github.com/broadcom/bcm11351:
pinctrl: Rename Broadcom Capri pinctrl binding
pinctrl: refer to updated dt binding string.
Update dtsi with new pinctrl compatible string
+ Linux 3.14-rc4
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index f342278539d..494b888a656 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -139,7 +139,7 @@ config MACVTAP This adds a specialized tap character device driver that is based on the MAC-VLAN network interface, called macvtap. A macvtap device can be added in the same way as a macvlan device, using 'type - macvlan', and then be accessed through the tap user space interface. + macvtap', and then be accessed through the tap user space interface. To compile this driver as a module, choose M here: the module will be called macvtap. |