Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville...

[linux-2.6-omap-h63xx.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ba314adf68b86ecf856a6ebecada8c2ef019feb9..d17d64eb7065e251e7b6f09f6060a9671b271e03 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -82,6 +82,16 @@ config BONDING
          To compile this driver as a module, choose M here: the module
          will be called bonding.
 
+config MACVLAN
+       tristate "MAC-VLAN support (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       ---help---
+         This allows one to create virtual interfaces that map packets to
+         or from specific MAC addresses to a particular interface.
+
+         To compile this driver as a module, choose M here: the module
+         will be called macvlan.
+
 config EQUALIZER
        tristate "EQL (serial line load balancing) support"
        ---help---