1 files changed, 24 insertions, 4 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index fd284a93c9dd..83b3f7b8fb73 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1448,18 +1448,38 @@ config APRICOT
           called apricot.
 
 config B44
-        tristate "Broadcom 4400 ethernet support"
-        depends on NET_PCI && PCI
+        tristate "Broadcom 440x/47xx ethernet support"
+        depends on SSB_POSSIBLE
+        select SSB
         select MII
         help
-          If you have a network (Ethernet) controller of this type, say Y and
-          read the Ethernet-HOWTO, available from
+          If you have a network (Ethernet) controller of this type, say Y
+          or M and read the Ethernet-HOWTO, available from
           <http://www.tldp.org/docs.html#howto>.
 
           To compile this driver as a module, choose M here and read
           <file:Documentation/networking/net-modules.txt>.  The module will be
           called b44.
 
+# Auto-select SSB PCI-HOST support, if possible
+config B44_PCI_AUTOSELECT
+        bool
+        depends on B44 && SSB_PCIHOST_POSSIBLE
+        select SSB_PCIHOST
+        default y
+
+# Auto-select SSB PCICORE driver, if possible
+config B44_PCICORE_AUTOSELECT
+        bool
+        depends on B44 && SSB_DRIVER_PCICORE_POSSIBLE
+        select SSB_DRIVER_PCICORE
+        default y
+
+config B44_PCI
+        bool
+        depends on B44_PCI_AUTOSELECT && B44_PCICORE_AUTOSELECT
+        default y
+
 config FORCEDETH
         tristate "nForce Ethernet support"
         depends on NET_PCI && PCI