1 files changed, 26 insertions, 5 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 86fe67fd49ba..4f1755bddf6b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1041,7 +1041,7 @@ config SMC911X
         tristate "SMSC LAN911[5678] support"
         select CRC32
         select MII
-        depends on ARM || SUPERH
+        depends on ARM || SUPERH || MN10300
         help
           This is a driver for SMSC's LAN911x series of Ethernet chipsets
           including the new LAN9115, LAN9116, LAN9117, and LAN9118.
@@ -1055,7 +1055,7 @@ config SMC911X
 
 config SMSC911X
         tristate "SMSC LAN911x/LAN921x families embedded ethernet support"
-        depends on ARM || SUPERH || BLACKFIN || MIPS
+        depends on ARM || SUPERH || BLACKFIN || MIPS || MN10300
         select CRC32
         select MII
         select PHYLIB
@@ -1067,6 +1067,14 @@ config SMSC911X
           <file:Documentation/networking/net-modules.txt>. The module
           will be called smsc911x.
 
+config SMSC911X_ARCH_HOOKS
+        def_bool n
+        depends on SMSC911X
+        help
+          If the arch enables this, it allows the arch to implement various
+          hooks for more comprehensive interrupt control and also to override
+          the source of the MAC address.
+
 config NET_VENDOR_RACAL
         bool "Racal-Interlan (Micom) NI cards"
         depends on ISA
@@ -2533,11 +2541,12 @@ source "drivers/net/stmmac/Kconfig"
 config PCH_GBE
         tristate "PCH Gigabit Ethernet"
         depends on PCI
+        select MII
         ---help---
-          This is a gigabit ethernet driver for Topcliff PCH.
-          Topcliff PCH is the platform controller hub that is used in Intel's
+          This is a gigabit ethernet driver for EG20T PCH.
+          EG20T PCH is the platform controller hub that is used in Intel's
           general embedded platform.
-          Topcliff PCH has Gigabit Ethernet interface.
+          EG20T PCH has Gigabit Ethernet interface.
           Using this interface, it is able to access system devices connected
           to Gigabit Ethernet.
           This driver enables Gigabit Ethernet function.
@@ -2936,6 +2945,18 @@ source "drivers/s390/net/Kconfig"
 
 source "drivers/net/caif/Kconfig"
 
+config TILE_NET
+        tristate "Tilera GBE/XGBE network driver support"
+        depends on TILE
+        default y
+        select CRC32
+        help
+          This is a standard Linux network device driver for the
+          on-chip Tilera Gigabit Ethernet and XAUI interfaces.
+
+          To compile this driver as a module, choose M here: the module
+          will be called tile_net.
+
 config XEN_NETDEV_FRONTEND
         tristate "Xen network device frontend driver"
         depends on XEN