diff options
author | Mark Brown <broonie@kernel.org> | 2016-05-03 16:09:56 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-05-03 16:09:56 +0200 |
commit | bc0868c62bb13834b20a864f684cced1f84a2412 (patch) | |
tree | 2c382dcd24ac95f4dbf53d238d3161d6171d8a4b /drivers/net/ethernet/sun/Kconfig | |
parent | regulator: pwm: Try to avoid voltage error in duty cycle calculation (diff) | |
parent | regulator: pwm: Use pwm_get_args() where appropriate (diff) | |
download | linux-bc0868c62bb13834b20a864f684cced1f84a2412.tar.xz linux-bc0868c62bb13834b20a864f684cced1f84a2412.zip |
Merge branch 'for-4.7/pwm-regulator' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm into regulator-pwm
Diffstat (limited to 'drivers/net/ethernet/sun/Kconfig')
-rw-r--r-- | drivers/net/ethernet/sun/Kconfig | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/net/ethernet/sun/Kconfig b/drivers/net/ethernet/sun/Kconfig index dee94b67638c..a4b40e3015e5 100644 --- a/drivers/net/ethernet/sun/Kconfig +++ b/drivers/net/ethernet/sun/Kconfig @@ -69,12 +69,28 @@ config CASSINI Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also <http://docs.oracle.com/cd/E19113-01/giga.ether.pci/817-4341-10/817-4341-10.pdf>. +config SUNVNET_COMMON + bool + depends on SUN_LDOMS + default y if SUN_LDOMS + config SUNVNET tristate "Sun Virtual Network support" depends on SUN_LDOMS ---help--- Support for virtual network devices under Sun Logical Domains. +config LDMVSW + tristate "Sun4v LDoms Virtual Switch support" + depends on SUN_LDOMS + ---help--- + Support for virtual switch devices under Sun4v Logical Domains. + This driver adds a network interface for every vsw-port node + found in the machine description of a service domain. + Linux bridge/switch software can use these interfaces for + guest domain network interconnectivity or guest domain + connection to a physical network on a service domain. + config NIU tristate "Sun Neptune 10Gbit Ethernet support" depends on PCI |