diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
| commit | 708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch) | |
| tree | fe7c31bc0edef84eb1075c7e195340047d6aaa17 /Documentation/networking/skfp.txt | |
| parent | f3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff) | |
| parent | a847825970e741e20a09c659978baa34016b63bc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'Documentation/networking/skfp.txt')
| -rw-r--r-- | Documentation/networking/skfp.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/networking/skfp.txt b/Documentation/networking/skfp.txt index 3a419ed42f81..abfddf81e34a 100644 --- a/Documentation/networking/skfp.txt +++ b/Documentation/networking/skfp.txt | |||
| @@ -81,7 +81,7 @@ Makes my life much easier :-) | |||
| 81 | 81 | ||
| 82 | If you run into problems during installation, check those items: | 82 | If you run into problems during installation, check those items: |
| 83 | 83 | ||
| 84 | Problem: The FDDI adapter can not be found by the driver. | 84 | Problem: The FDDI adapter cannot be found by the driver. |
| 85 | Reason: Look in /proc/pci for the following entry: | 85 | Reason: Look in /proc/pci for the following entry: |
| 86 | 'FDDI network controller: SysKonnect SK-FDDI-PCI ...' | 86 | 'FDDI network controller: SysKonnect SK-FDDI-PCI ...' |
| 87 | If this entry exists, then the FDDI adapter has been | 87 | If this entry exists, then the FDDI adapter has been |
| @@ -99,7 +99,7 @@ Reason: Look in /proc/pci for the following entry: | |||
| 99 | 99 | ||
| 100 | Problem: You want to use your computer as a router between | 100 | Problem: You want to use your computer as a router between |
| 101 | multiple IP subnetworks (using multiple adapters), but | 101 | multiple IP subnetworks (using multiple adapters), but |
| 102 | you can not reach computers in other subnetworks. | 102 | you cannot reach computers in other subnetworks. |
| 103 | Reason: Either the router's kernel is not configured for IP | 103 | Reason: Either the router's kernel is not configured for IP |
| 104 | forwarding or there is a problem with the routing table | 104 | forwarding or there is a problem with the routing table |
| 105 | and gateway configuration in at least one of the | 105 | and gateway configuration in at least one of the |