Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux...

[~andy/linux] / Documentation / networking / e1000.txt

diff --git a/Documentation/networking/e1000.txt b/Documentation/networking/e1000.txt
index 71fe15af356cda609a2a0abae7b11bff1be1df0a..5c0a5cc039981926afe71b2a9009c70405e1a95b 100644 (file)
--- a/Documentation/networking/e1000.txt
+++ b/Documentation/networking/e1000.txt
@@ -350,7 +350,7 @@ Additional Configurations
 
   As an example, if you install the e1000 driver for two PRO/1000 adapters
   (eth0 and eth1) and set the speed and duplex to 10full and 100half, add
-  the following to modules.conf or or modprobe.conf:
+  the following to modules.conf or modprobe.conf:
 
        alias eth0 e1000
        alias eth1 e1000