Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

[linux-2.6] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 01ddcbc14fa0f9d3e93d7a63d0218853d4ba7081..ad92b6a76ee64bb8108eef5e0db2d8663ad3c672 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -190,7 +190,7 @@ config MII
 
 config MACB
        tristate "Atmel MACB support"
-       depends on NET_ETHERNET && AVR32
+       depends on NET_ETHERNET && (AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263)
        select MII
        help
          The Atmel MACB ethernet interface is found on many AT32 and AT91
@@ -2493,6 +2493,13 @@ config NETXEN_NIC
        help
          This enables the support for NetXen's Gigabit Ethernet card.
 
+config PASEMI_MAC
+       tristate "PA Semi 1/10Gbit MAC"
+       depends on PPC64 && PCI
+       help
+         This driver supports the on-chip 1/10Gbit Ethernet controller on
+         PA Semi's PWRficient line of chips.
+
 endmenu
 
 source "drivers/net/tokenring/Kconfig"
@@ -2546,6 +2553,7 @@ config DEFXX
 config SKFP
        tristate "SysKonnect FDDI PCI support"
        depends on FDDI && PCI
+       select BITREVERSE
        ---help---
          Say Y here if you have a SysKonnect FDDI PCI adapter.
          The following adapters are supported by this driver: