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

[safe/jmp/linux-2.6] / net / 802 / Kconfig

diff --git a/net/802/Kconfig b/net/802/Kconfig
index 01cb094..be33d27 100644 (file)
--- a/net/802/Kconfig
+++ b/net/802/Kconfig
@@ -1,3 +1,7 @@
 config STP
        tristate
        select LLC
+
+config GARP
+       tristate
+       select STP