Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[sfrench/cifs-2.6.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 6c521b4c319dd5300b0489648c8b62782625d02b..dd9a09c72dfff2b080f09499a4afe8d6b2ad68ad 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1953,6 +1953,8 @@ config BCM63XX_ENET
 
 source "drivers/net/fs_enet/Kconfig"
 
 
 source "drivers/net/fs_enet/Kconfig"
 

+source "drivers/net/octeon/Kconfig"
+

 endif # NET_ETHERNET
 
 #
 endif # NET_ETHERNET
 
 #