Merge branch 'core/xen' into x86/urgent

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

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 9a18270..6bdfd47 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -830,7 +830,7 @@ config ULTRA32
 
 config BFIN_MAC
        tristate "Blackfin on-chip MAC support"
-       depends on NET_ETHERNET && (BF526 || BF527 || BF536 || BF537)
+       depends on NET_ETHERNET && (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)
        select CRC32
        select MII
        select PHYLIB
@@ -1600,7 +1600,7 @@ config 8139_OLD_RX_RESET
          old RX-reset behavior.  If unsure, say N.
 
 config R6040
-       tristate "RDC R6040 Fast Ethernet Adapter support (EXPERIMENTAL)"
+       tristate "RDC R6040 Fast Ethernet Adapter support"
        depends on NET_PCI && PCI
        select CRC32
        select MII
@@ -1829,7 +1829,7 @@ config 68360_ENET
 
 config FEC
        bool "FEC ethernet controller (of ColdFire CPUs)"
-       depends on M523x || M527x || M5272 || M528x || M520x
+       depends on M523x || M527x || M5272 || M528x || M520x || M532x
        help
          Say Y here if you want to use the built-in 10/100 Fast ethernet
          controller on some Motorola ColdFire processors.
@@ -2614,6 +2614,8 @@ source "drivers/net/tokenring/Kconfig"
 
 source "drivers/net/wireless/Kconfig"
 
+source "drivers/net/wimax/Kconfig"
+
 source "drivers/net/usb/Kconfig"
 
 source "drivers/net/pcmcia/Kconfig"