diff options
author | Mark Brown <broonie@linaro.org> | 2014-03-19 14:02:34 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-19 14:02:34 +0100 |
commit | 236b11de51c7501c454ca125d84152b06ef7f27e (patch) | |
tree | d0ca0b99961da2a8a46b4f86a57de8424dadce1d /drivers/net/Kconfig | |
parent | regulator: s2mps11: Fix section mismatch (diff) | |
parent | Documentation: mfd: Add binding document for S2MPA01 (diff) | |
download | linux-236b11de51c7501c454ca125d84152b06ef7f27e.tar.xz linux-236b11de51c7501c454ca125d84152b06ef7f27e.zip |
Merge branch 'ib-mfd-regulator-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-s2mps11
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 f342278539d5..494b888a6568 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. |