Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[sfrench/cifs-2.6.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e0b11095b9da94656b2d8251fbecf6336236c718..e20b849a22e8e59a4f3fb06304b1f190d840c050 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1914,7 +1914,7 @@ config E1000_DISABLE_PACKET_SPLIT
        depends on E1000
        help
          Say Y here if you want to use the legacy receive path for PCI express
-         hadware.
+         hardware.
 
          If in doubt, say N.
 
@@ -2172,6 +2172,7 @@ config BNX2
 config SPIDER_NET
        tristate "Spider Gigabit Ethernet driver"
        depends on PCI && PPC_CELL
+       select FW_LOADER
        help
          This driver supports the Gigabit Ethernet chips present on the
          Cell Processor-Based Blades from IBM.