Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / Documentation / networking / wan-router.txt

diff --git a/Documentation/networking/wan-router.txt b/Documentation/networking/wan-router.txt
index 66b902691fdf4abb94ec41f3a4dc1ea16999934a..07dd6d9930a14d22fe30e783e6e59ed38918ad9f 100644 (file)
--- a/Documentation/networking/wan-router.txt
+++ b/Documentation/networking/wan-router.txt
@@ -250,7 +250,6 @@ PRODUCT COMPONENTS AND RELATED FILES
        sdladrv.h       SDLA support module API definitions
        sdlasfm.h       SDLA firmware module definitions
        if_wanpipe.h    WANPIPE Socket definitions
-       if_wanpipe_common.h     WANPIPE Socket/Driver common definitions.
        sdlapci.h       WANPIPE PCI definitions
        
 
@@ -444,7 +443,7 @@ beta1-2.1.5         Nov 15 2000
                                        
                                o Cpipemon
                                        - Added set FT1 commands to the cpipemon. Thus CSU/DSU
-                                         configuraiton can be performed using cpipemon.
+                                         configuration can be performed using cpipemon.
                                          All systems that cannot run cfgft1 GUI utility should
                                          use cpipemon to configure the on board CSU/DSU.
 
@@ -464,7 +463,7 @@ beta1-2.1.5         Nov 15 2000
                                        - Appropriate number of devices are dynamically loaded 
                                          based on the number of Sangoma cards found.
 
-                                         Note: The kernel configuraiton option 
+                                         Note: The kernel configuration option 
                                                CONFIG_WANPIPE_CARDS has been taken out.
                                        
                                o Fixed the Frame Relay and Chdlc network interfaces so they are