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

[pandora-kernel.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 18ff622..dd9a09c 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/octeon/Kconfig"
+
 endif # NET_ETHERNET
 
 #
@@ -2698,6 +2700,7 @@ config NETXEN_NIC
 config NIU
        tristate "Sun Neptune 10Gbit Ethernet support"
        depends on PCI
+       select CRC32
        help
          This enables support for cards based upon Sun's
          Neptune chipset.