Merge branch 'upstream'

[linux-2.6] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e0b11095b9da94656b2d8251fbecf6336236c718..00993e8ba589812995d4ad140de2b6bad4e08f02 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.