aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorJody McIntyre <scjody@modernduck.com>2005-11-28 17:46:32 -0500
committerJody McIntyre <scjody@modernduck.com>2005-11-28 17:46:32 -0500
commita880b11a95fab4618da412d99fc7365d723e702d (patch)
tree10839a82741b7154067adfff425dadef3caf4163 /Documentation
parent899a1fc084ef3dcb57737d8847bf219cbf353ed3 (diff)
parent458af5439fe7ae7d95ca14106844e61f0795166c (diff)
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/arm/VFP/release-notes.txt2
-rw-r--r--Documentation/dvb/faq.txt1
-rw-r--r--Documentation/filesystems/affs.txt2
-rw-r--r--Documentation/filesystems/ext2.txt3
-rw-r--r--Documentation/floppy.txt10
-rw-r--r--Documentation/ioctl-number.txt2
-rw-r--r--Documentation/kernel-docs.txt60
-rw-r--r--Documentation/mca.txt2
-rw-r--r--Documentation/networking/driver.txt5
-rw-r--r--Documentation/networking/ifenslave.c9
-rw-r--r--Documentation/networking/iphase.txt2
-rw-r--r--Documentation/networking/irda.txt8
-rw-r--r--Documentation/networking/ray_cs.txt3
-rw-r--r--Documentation/networking/vortex.txt28
-rw-r--r--Documentation/power/pci.txt2
-rw-r--r--Documentation/scsi/ibmmca.txt4
-rw-r--r--Documentation/usb/ibmcam.txt4
-rw-r--r--Documentation/usb/ov511.txt4
-rw-r--r--Documentation/usb/rio.txt6
-rw-r--r--Documentation/video4linux/zr36120.txt7
20 files changed, 80 insertions, 84 deletions
diff --git a/Documentation/arm/VFP/release-notes.txt b/Documentation/arm/VFP/release-notes.txt
index f28e0222f5e5..28a2795705ca 100644
--- a/Documentation/arm/VFP/release-notes.txt
+++ b/Documentation/arm/VFP/release-notes.txt
@@ -12,7 +12,7 @@ This release has been validated against the SoftFloat-2b library by
12John R. Hauser using the TestFloat-2a test suite. Details of this 12John R. Hauser using the TestFloat-2a test suite. Details of this
13library and test suite can be found at: 13library and test suite can be found at:
14 14
15 http://www.cs.berkeley.edu/~jhauser/arithmetic/SoftFloat.html 15 http://www.jhauser.us/arithmetic/SoftFloat.html
16 16
17The operations which have been tested with this package are: 17The operations which have been tested with this package are:
18 18
diff --git a/Documentation/dvb/faq.txt b/Documentation/dvb/faq.txt
index 3bf51e45c972..a42132d60dc8 100644
--- a/Documentation/dvb/faq.txt
+++ b/Documentation/dvb/faq.txt
@@ -60,7 +60,6 @@ Some very frequently asked questions about linuxtv-dvb
60 Metzler Bros. DVB development; alternate drivers and 60 Metzler Bros. DVB development; alternate drivers and
61 DVB utilities, include dvb-mpegtools and tuxzap. 61 DVB utilities, include dvb-mpegtools and tuxzap.
62 62
63 http://www.linuxstb.org/
64 http://sourceforge.net/projects/dvbtools/ 63 http://sourceforge.net/projects/dvbtools/
65 Dave Chapman's dvbtools package, including 64 Dave Chapman's dvbtools package, including
66 dvbstream and dvbtune 65 dvbstream and dvbtune
diff --git a/Documentation/filesystems/affs.txt b/Documentation/filesystems/affs.txt
index 30c9738590f4..2d1524469c25 100644
--- a/Documentation/filesystems/affs.txt
+++ b/Documentation/filesystems/affs.txt
@@ -216,4 +216,4 @@ due to an incompatibility with the Amiga floppy controller.
216 216
217If you are interested in an Amiga Emulator for Linux, look at 217If you are interested in an Amiga Emulator for Linux, look at
218 218
219http://www-users.informatik.rwth-aachen.de/~crux/uae.html 219http://www.freiburg.linux.de/~uae/
diff --git a/Documentation/filesystems/ext2.txt b/Documentation/filesystems/ext2.txt
index a8edb376b041..3dd2872416a1 100644
--- a/Documentation/filesystems/ext2.txt
+++ b/Documentation/filesystems/ext2.txt
@@ -369,9 +369,8 @@ The kernel source file:/usr/src/linux/fs/ext2/
369e2fsprogs (e2fsck) http://e2fsprogs.sourceforge.net/ 369e2fsprogs (e2fsck) http://e2fsprogs.sourceforge.net/
370Design & Implementation http://e2fsprogs.sourceforge.net/ext2intro.html 370Design & Implementation http://e2fsprogs.sourceforge.net/ext2intro.html
371Journaling (ext3) ftp://ftp.uk.linux.org/pub/linux/sct/fs/jfs/ 371Journaling (ext3) ftp://ftp.uk.linux.org/pub/linux/sct/fs/jfs/
372Hashed Directories http://kernelnewbies.org/~phillips/htree/
373Filesystem Resizing http://ext2resize.sourceforge.net/ 372Filesystem Resizing http://ext2resize.sourceforge.net/
374Compression (*) http://www.netspace.net.au/~reiter/e2compr/ 373Compression (*) http://e2compr.sourceforge.net/
375 374
376Implementations for: 375Implementations for:
377Windows 95/98/NT/2000 http://uranus.it.swin.edu.au/~jn/linux/Explore2fs.htm 376Windows 95/98/NT/2000 http://uranus.it.swin.edu.au/~jn/linux/Explore2fs.htm
diff --git a/Documentation/floppy.txt b/Documentation/floppy.txt
index 6fb10fcd82fb..6ccab88705cb 100644
--- a/Documentation/floppy.txt
+++ b/Documentation/floppy.txt
@@ -4,7 +4,7 @@ FAQ list:
4========= 4=========
5 5
6 A FAQ list may be found in the fdutils package (see below), and also 6 A FAQ list may be found in the fdutils package (see below), and also
7at http://fdutils.linux.lu/FAQ.html 7at <http://fdutils.linux.lu/faq.html>.
8 8
9 9
10LILO configuration options (Thinkpad users, read this) 10LILO configuration options (Thinkpad users, read this)
@@ -217,10 +217,10 @@ It also contains additional documentation about the floppy driver.
217The latest version can be found at fdutils homepage: 217The latest version can be found at fdutils homepage:
218 http://fdutils.linux.lu 218 http://fdutils.linux.lu
219 219
220The fdutils-5.4 release can be found at: 220The fdutils releases can be found at:
221 http://fdutils.linux.lu/fdutils-5.4.src.tar.gz 221 http://fdutils.linux.lu/download.html
222 http://www.tux.org/pub/knaff/fdutils/fdutils-5.4.src.tar.gz 222 http://www.tux.org/pub/knaff/fdutils/
223 ftp://metalab.unc.edu/pub/Linux/utils/disk-management/fdutils-5.4.src.tar.gz 223 ftp://metalab.unc.edu/pub/Linux/utils/disk-management/
224 224
225Reporting problems about the floppy driver 225Reporting problems about the floppy driver
226========================================== 226==========================================
diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt
index 87f4d052e39c..aa7ba00ec082 100644
--- a/Documentation/ioctl-number.txt
+++ b/Documentation/ioctl-number.txt
@@ -133,7 +133,7 @@ Code Seq# Include File Comments
133'l' 00-3F linux/tcfs_fs.h transparent cryptographic file system 133'l' 00-3F linux/tcfs_fs.h transparent cryptographic file system
134 <http://mikonos.dia.unisa.it/tcfs> 134 <http://mikonos.dia.unisa.it/tcfs>
135'l' 40-7F linux/udf_fs_i.h in development: 135'l' 40-7F linux/udf_fs_i.h in development:
136 <http://www.trylinux.com/projects/udf/> 136 <http://sourceforge.net/projects/linux-udf/>
137'm' all linux/mtio.h conflict! 137'm' all linux/mtio.h conflict!
138'm' all linux/soundcard.h conflict! 138'm' all linux/soundcard.h conflict!
139'm' all linux/synclink.h conflict! 139'm' all linux/synclink.h conflict!
diff --git a/Documentation/kernel-docs.txt b/Documentation/kernel-docs.txt
index cb89fb3b61ef..99d24f2943ee 100644
--- a/Documentation/kernel-docs.txt
+++ b/Documentation/kernel-docs.txt
@@ -196,7 +196,7 @@
196 196
197 * Title: "Writing Linux Device Drivers" 197 * Title: "Writing Linux Device Drivers"
198 Author: Michael K. Johnson. 198 Author: Michael K. Johnson.
199 URL: http://people.redhat.com/johnsonm/devices.html 199 URL: http://users.evitech.fi/~tk/rtos/writing_linux_device_d.html
200 Keywords: files, VFS, file operations, kernel interface, character 200 Keywords: files, VFS, file operations, kernel interface, character
201 vs block devices, I/O access, hardware interrupts, DMA, access to 201 vs block devices, I/O access, hardware interrupts, DMA, access to
202 user memory, memory allocation, timers. 202 user memory, memory allocation, timers.
@@ -284,7 +284,7 @@
284 284
285 * Title: "Linux Kernel Module Programming Guide" 285 * Title: "Linux Kernel Module Programming Guide"
286 Author: Ori Pomerantz. 286 Author: Ori Pomerantz.
287 URL: http://www.tldp.org/LDP/lkmpg/mpg.html 287 URL: http://tldp.org/LDP/lkmpg/2.6/html/index.html
288 Keywords: modules, GPL book, /proc, ioctls, system calls, 288 Keywords: modules, GPL book, /proc, ioctls, system calls,
289 interrupt handlers . 289 interrupt handlers .
290 Description: Very nice 92 pages GPL book on the topic of modules 290 Description: Very nice 92 pages GPL book on the topic of modules
@@ -292,7 +292,7 @@
292 292
293 * Title: "Device File System (devfs) Overview" 293 * Title: "Device File System (devfs) Overview"
294 Author: Richard Gooch. 294 Author: Richard Gooch.
295 URL: http://www.atnf.csiro.au/~rgooch/linux/docs/devfs.txt 295 URL: http://www.atnf.csiro.au/people/rgooch/linux/docs/devfs.html
296 Keywords: filesystem, /dev, devfs, dynamic devices, major/minor 296 Keywords: filesystem, /dev, devfs, dynamic devices, major/minor
297 allocation, device management. 297 allocation, device management.
298 Description: Document describing Richard Gooch's controversial 298 Description: Document describing Richard Gooch's controversial
@@ -316,9 +316,8 @@
316 316
317 * Title: "The Kernel Hacking HOWTO" 317 * Title: "The Kernel Hacking HOWTO"
318 Author: Various Talented People, and Rusty. 318 Author: Various Talented People, and Rusty.
319 URL: 319 Location: in kernel tree, Documentation/DocBook/kernel-hacking/
320 http://www.lisoleg.net/doc/Kernel-Hacking-HOWTO/kernel-hacking-HOW 320 (must be built as "make {htmldocs | psdocs | pdfdocs})
321 TO.html
322 Keywords: HOWTO, kernel contexts, deadlock, locking, modules, 321 Keywords: HOWTO, kernel contexts, deadlock, locking, modules,
323 symbols, return conventions. 322 symbols, return conventions.
324 Description: From the Introduction: "Please understand that I 323 Description: From the Introduction: "Please understand that I
@@ -332,13 +331,13 @@
332 originally written for the 2.3 kernels, but nearly all of it 331 originally written for the 2.3 kernels, but nearly all of it
333 applies to 2.2 too; 2.0 is slightly different". 332 applies to 2.2 too; 2.0 is slightly different".
334 333
335 * Title: "ALSA 0.5.0 Developer documentation" 334 * Title: "Writing an ALSA Driver"
336 Author: Stephan 'Jumpy' Bartels . 335 Author: Takashi Iwai <tiwai@suse.de>
337 URL: http://www.math.TU-Berlin.de/~sbartels/alsa/ 336 URL: http://www.alsa-project.org/~iwai/writing-an-alsa-driver/index.html
338 Keywords: ALSA, sound, soundcard, driver, lowlevel, hardware. 337 Keywords: ALSA, sound, soundcard, driver, lowlevel, hardware.
339 Description: Advanced Linux Sound Architecture for developers, 338 Description: Advanced Linux Sound Architecture for developers,
340 both at kernel and user-level sides. Work in progress. ALSA is 339 both at kernel and user-level sides. ALSA is the Linux kernel
341 supposed to be Linux's next generation sound architecture. 340 sound architecture in the 2.6 kernel version.
342 341
343 * Title: "Programming Guide for Linux USB Device Drivers" 342 * Title: "Programming Guide for Linux USB Device Drivers"
344 Author: Detlef Fliegl. 343 Author: Detlef Fliegl.
@@ -369,8 +368,8 @@
369 filesystems, IPC and Networking Code. 368 filesystems, IPC and Networking Code.
370 369
371 * Title: "Linux Kernel Mailing List Glossary" 370 * Title: "Linux Kernel Mailing List Glossary"
372 Author: John Levon. 371 Author: various
373 URL: http://www.movement.uklinux.net/glossary.html 372 URL: http://kernelnewbies.org/glossary/
374 Keywords: glossary, terms, linux-kernel. 373 Keywords: glossary, terms, linux-kernel.
375 Description: From the introduction: "This glossary is intended as 374 Description: From the introduction: "This glossary is intended as
376 a brief description of some of the acronyms and terms you may hear 375 a brief description of some of the acronyms and terms you may hear
@@ -378,9 +377,8 @@
378 377
379 * Title: "Linux Kernel Locking HOWTO" 378 * Title: "Linux Kernel Locking HOWTO"
380 Author: Various Talented People, and Rusty. 379 Author: Various Talented People, and Rusty.
381 URL: 380 Location: in kernel tree, Documentation/DocBook/kernel-locking/
382 http://netfilter.kernelnotes.org/unreliable-guides/kernel-locking- 381 (must be built as "make {htmldocs | psdocs | pdfdocs})
383 HOWTO.html
384 Keywords: locks, locking, spinlock, semaphore, atomic, race 382 Keywords: locks, locking, spinlock, semaphore, atomic, race
385 condition, bottom halves, tasklets, softirqs. 383 condition, bottom halves, tasklets, softirqs.
386 Description: The title says it all: document describing the 384 Description: The title says it all: document describing the
@@ -490,7 +488,7 @@
490 488
491 * Title: "Get those boards talking under Linux." 489 * Title: "Get those boards talking under Linux."
492 Author: Alex Ivchenko. 490 Author: Alex Ivchenko.
493 URL: http://www.ednmag.com/ednmag/reg/2000/06222000/13df2.htm 491 URL: http://www.edn.com/article/CA46968.html
494 Keywords: data-acquisition boards, drivers, modules, interrupts, 492 Keywords: data-acquisition boards, drivers, modules, interrupts,
495 memory allocation. 493 memory allocation.
496 Description: Article written for people wishing to make their data 494 Description: Article written for people wishing to make their data
@@ -498,7 +496,7 @@
498 overview on writing drivers, from the naming of functions to 496 overview on writing drivers, from the naming of functions to
499 interrupt handling. 497 interrupt handling.
500 Notes: Two-parts article. Part II is at 498 Notes: Two-parts article. Part II is at
501 http://www.ednmag.com/ednmag/reg/2000/07062000/14df.htm 499 URL: http://www.edn.com/article/CA46998.html
502 500
503 * Title: "Linux PCMCIA Programmer's Guide" 501 * Title: "Linux PCMCIA Programmer's Guide"
504 Author: David Hinds. 502 Author: David Hinds.
@@ -529,7 +527,7 @@
529 definitive guide for hackers, virus coders and system 527 definitive guide for hackers, virus coders and system
530 administrators." 528 administrators."
531 Author: pragmatic/THC. 529 Author: pragmatic/THC.
532 URL: http://packetstorm.securify.com/groups/thc/LKM_HACKING.html 530 URL: http://packetstormsecurity.org/docs/hack/LKM_HACKING.html
533 Keywords: syscalls, intercept, hide, abuse, symbol table. 531 Keywords: syscalls, intercept, hide, abuse, symbol table.
534 Description: Interesting paper on how to abuse the Linux kernel in 532 Description: Interesting paper on how to abuse the Linux kernel in
535 order to intercept and modify syscalls, make 533 order to intercept and modify syscalls, make
@@ -537,8 +535,7 @@
537 write kernel modules based virus... and solutions for admins to 535 write kernel modules based virus... and solutions for admins to
538 avoid all those abuses. 536 avoid all those abuses.
539 Notes: For 2.0.x kernels. Gives guidances to port it to 2.2.x 537 Notes: For 2.0.x kernels. Gives guidances to port it to 2.2.x
540 kernels. Also available in txt format at 538 kernels.
541 http://www.blacknemesis.org/hacking/txt/cllkm.txt
542 539
543 BOOKS: (Not on-line) 540 BOOKS: (Not on-line)
544 541
@@ -557,7 +554,17 @@
557 ISBN: 0-59600-008-1 554 ISBN: 0-59600-008-1
558 Notes: Further information in 555 Notes: Further information in
559 http://www.oreilly.com/catalog/linuxdrive2/ 556 http://www.oreilly.com/catalog/linuxdrive2/
560 557
558 * Title: "Linux Device Drivers, 3nd Edition"
559 Authors: Jonathan Corbet, Alessandro Rubini, and Greg Kroah-Hartman
560 Publisher: O'Reilly & Associates.
561 Date: 2005.
562 Pages: 636.
563 ISBN: 0-596-00590-3
564 Notes: Further information in
565 http://www.oreilly.com/catalog/linuxdrive3/
566 PDF format, URL: http://lwn.net/Kernel/LDD3/
567
561 * Title: "Linux Kernel Internals" 568 * Title: "Linux Kernel Internals"
562 Author: Michael Beck. 569 Author: Michael Beck.
563 Publisher: Addison-Wesley. 570 Publisher: Addison-Wesley.
@@ -766,12 +773,15 @@
766 documents, FAQs... 773 documents, FAQs...
767 774
768 * Name: "linux-kernel mailing list archives and search engines" 775 * Name: "linux-kernel mailing list archives and search engines"
776 URL: http://vger.kernel.org/vger-lists.html
769 URL: http://www.uwsg.indiana.edu/hypermail/linux/kernel/index.html 777 URL: http://www.uwsg.indiana.edu/hypermail/linux/kernel/index.html
770 URL: http://www.kernelnotes.org/lnxlists/linux-kernel/ 778 URL: http://marc.theaimsgroup.com/?l=linux-kernel
771 URL: http://www.geocrawler.com 779 URL: http://groups.google.com/group/mlist.linux.kernel
780 URL: http://www.cs.helsinki.fi/linux/linux-kernel/
781 URL: http://www.lib.uaa.alaska.edu/linux-kernel/
772 Keywords: linux-kernel, archives, search. 782 Keywords: linux-kernel, archives, search.
773 Description: Some of the linux-kernel mailing list archivers. If 783 Description: Some of the linux-kernel mailing list archivers. If
774 you have a better/another one, please let me know. 784 you have a better/another one, please let me know.
775 _________________________________________________________________ 785 _________________________________________________________________
776 786
777 Document last updated on Thu Jun 28 15:09:39 CEST 2001 787 Document last updated on Sat 2005-NOV-19
diff --git a/Documentation/mca.txt b/Documentation/mca.txt
index 6e32c305c65a..60913354cb7d 100644
--- a/Documentation/mca.txt
+++ b/Documentation/mca.txt
@@ -252,7 +252,7 @@ their names here, but I don't have a list handy. Check the MCA Linux
252home page (URL below) for a perpetually out-of-date list. 252home page (URL below) for a perpetually out-of-date list.
253 253
254===================================================================== 254=====================================================================
255MCA Linux Home Page: http://glycerine.itsmm.uni.edu/mca/ 255MCA Linux Home Page: http://www.dgmicro.com/mca/
256 256
257Christophe Beauregard 257Christophe Beauregard
258chrisb@truespectra.com 258chrisb@truespectra.com
diff --git a/Documentation/networking/driver.txt b/Documentation/networking/driver.txt
index 11fd0ef5ff57..a9ad58b49cc5 100644
--- a/Documentation/networking/driver.txt
+++ b/Documentation/networking/driver.txt
@@ -1,7 +1,4 @@
1Documents about softnet driver issues in general can be found 1Document about softnet driver issues
2at:
3
4 http://www.firstfloor.org/~andi/softnet/
5 2
6Transmit path guidelines: 3Transmit path guidelines:
7 4
diff --git a/Documentation/networking/ifenslave.c b/Documentation/networking/ifenslave.c
index f315d20d3867..545447ac503a 100644
--- a/Documentation/networking/ifenslave.c
+++ b/Documentation/networking/ifenslave.c
@@ -693,13 +693,7 @@ static int enslave(char *master_ifname, char *slave_ifname)
693 /* Older bonding versions would panic if the slave has no IP 693 /* Older bonding versions would panic if the slave has no IP
694 * address, so get the IP setting from the master. 694 * address, so get the IP setting from the master.
695 */ 695 */
696 res = set_if_addr(master_ifname, slave_ifname); 696 set_if_addr(master_ifname, slave_ifname);
697 if (res) {
698 fprintf(stderr,
699 "Slave '%s': Error: set address failed\n",
700 slave_ifname);
701 return res;
702 }
703 } else { 697 } else {
704 res = clear_if_addr(slave_ifname); 698 res = clear_if_addr(slave_ifname);
705 if (res) { 699 if (res) {
@@ -1085,7 +1079,6 @@ static int set_if_addr(char *master_ifname, char *slave_ifname)
1085 slave_ifname, ifra[i].req_name, 1079 slave_ifname, ifra[i].req_name,
1086 strerror(saved_errno)); 1080 strerror(saved_errno));
1087 1081
1088 return res;
1089 } 1082 }
1090 1083
1091 ipaddr = ifr.ifr_addr.sa_data; 1084 ipaddr = ifr.ifr_addr.sa_data;
diff --git a/Documentation/networking/iphase.txt b/Documentation/networking/iphase.txt
index 39ccb8595bf1..493203a080a8 100644
--- a/Documentation/networking/iphase.txt
+++ b/Documentation/networking/iphase.txt
@@ -22,7 +22,7 @@ The features and limitations of this driver are as follows:
22 - All variants of Interphase ATM PCI (i)Chip adapter cards are supported, 22 - All variants of Interphase ATM PCI (i)Chip adapter cards are supported,
23 including x575 (OC3, control memory 128K , 512K and packet memory 128K, 23 including x575 (OC3, control memory 128K , 512K and packet memory 128K,
24 512K and 1M), x525 (UTP25) and x531 (DS3 and E3). See 24 512K and 1M), x525 (UTP25) and x531 (DS3 and E3). See
25 http://www.iphase.com/products/ClassSheet.cfm?ClassID=ATM 25 http://www.iphase.com/site/iphase-web/?epi_menuItemID=e196f04b4b3b40502f150882e21046a0
26 for details. 26 for details.
27 - Only x86 platforms are supported. 27 - Only x86 platforms are supported.
28 - SMP is supported. 28 - SMP is supported.
diff --git a/Documentation/networking/irda.txt b/Documentation/networking/irda.txt
index 9e5b8e66d6a5..bff26c138be6 100644
--- a/Documentation/networking/irda.txt
+++ b/Documentation/networking/irda.txt
@@ -3,12 +3,8 @@ of the IrDA Utilities. More detailed information about these and associated
3programs can be found on http://irda.sourceforge.net/ 3programs can be found on http://irda.sourceforge.net/
4 4
5For more information about how to use the IrDA protocol stack, see the 5For more information about how to use the IrDA protocol stack, see the
6Linux Infared HOWTO (http://www.tuxmobil.org/Infrared-HOWTO/Infrared-HOWTO.html) 6Linux Infrared HOWTO by Werner Heuser <wehe@tuxmobil.org>:
7by Werner Heuser <wehe@tuxmobil.org> 7<http://www.tuxmobil.org/Infrared-HOWTO/Infrared-HOWTO.html>
8 8
9There is an active mailing list for discussing Linux-IrDA matters called 9There is an active mailing list for discussing Linux-IrDA matters called
10 irda-users@lists.sourceforge.net 10 irda-users@lists.sourceforge.net
11
12
13
14
diff --git a/Documentation/networking/ray_cs.txt b/Documentation/networking/ray_cs.txt
index b1def00bc4a3..5427f8c7df95 100644
--- a/Documentation/networking/ray_cs.txt
+++ b/Documentation/networking/ray_cs.txt
@@ -29,8 +29,7 @@ with nondefault parameters, they can be edited in
29will find them all. 29will find them all.
30 30
31Information on card services is available at: 31Information on card services is available at:
32 ftp://hyper.stanford.edu/pub/pcmcia/doc 32 http://pcmcia-cs.sourceforge.net/
33 http://hyper.stanford.edu/HyperNews/get/pcmcia/home.html
34 33
35 34
36Card services user programs are still required for PCMCIA devices. 35Card services user programs are still required for PCMCIA devices.
diff --git a/Documentation/networking/vortex.txt b/Documentation/networking/vortex.txt
index 80e1cb19609f..3759acf95b29 100644
--- a/Documentation/networking/vortex.txt
+++ b/Documentation/networking/vortex.txt
@@ -11,7 +11,7 @@ The driver was written by Donald Becker <becker@scyld.com>
11Don is no longer the prime maintainer of this version of the driver. 11Don is no longer the prime maintainer of this version of the driver.
12Please report problems to one or more of: 12Please report problems to one or more of:
13 13
14 Andrew Morton <andrewm@uow.edu.au> 14 Andrew Morton <akpm@osdl.org>
15 Netdev mailing list <netdev@vger.kernel.org> 15 Netdev mailing list <netdev@vger.kernel.org>
16 Linux kernel mailing list <linux-kernel@vger.kernel.org> 16 Linux kernel mailing list <linux-kernel@vger.kernel.org>
17 17
@@ -274,24 +274,24 @@ Details of the device driver implementation are at the top of the source file.
274 274
275Additional documentation is available at Don Becker's Linux Drivers site: 275Additional documentation is available at Don Becker's Linux Drivers site:
276 276
277 http://www.scyld.com/network/vortex.html 277 http://www.scyld.com/vortex.html
278 278
279Donald Becker's driver development site: 279Donald Becker's driver development site:
280 280
281 http://www.scyld.com/network 281 http://www.scyld.com/network.html
282 282
283Donald's vortex-diag program is useful for inspecting the NIC's state: 283Donald's vortex-diag program is useful for inspecting the NIC's state:
284 284
285 http://www.scyld.com/diag/#pci-diags 285 http://www.scyld.com/ethercard_diag.html
286 286
287Donald's mii-diag program may be used for inspecting and manipulating 287Donald's mii-diag program may be used for inspecting and manipulating
288the NIC's Media Independent Interface subsystem: 288the NIC's Media Independent Interface subsystem:
289 289
290 http://www.scyld.com/diag/#mii-diag 290 http://www.scyld.com/ethercard_diag.html#mii-diag
291 291
292Donald's wake-on-LAN page: 292Donald's wake-on-LAN page:
293 293
294 http://www.scyld.com/expert/wake-on-lan.html 294 http://www.scyld.com/wakeonlan.html
295 295
2963Com's documentation for many NICs, including the ones supported by 2963Com's documentation for many NICs, including the ones supported by
297this driver is available at 297this driver is available at
@@ -305,7 +305,7 @@ this driver is available at
305Driver updates and a detailed changelog for the modifications which 305Driver updates and a detailed changelog for the modifications which
306were made for the 2.3/2,4 series kernel is available at 306were made for the 2.3/2,4 series kernel is available at
307 307
308 http://www.uow.edu.au/~andrewm/linux/#3c59x-2.3 308 http://www.zip.com.au/~akpm/linux/#3c59x-bc
309 309
310 310
311Autonegotiation notes 311Autonegotiation notes
@@ -434,8 +434,8 @@ steps you should take:
434 send all logs to the maintainer. 434 send all logs to the maintainer.
435 435
436 3) Download you card's diagnostic tool from Donald 436 3) Download you card's diagnostic tool from Donald
437 Backer's website http://www.scyld.com/diag. Download 437 Becker's website <http://www.scyld.com/ethercard_diag.html>.
438 mii-diag.c as well. Build these. 438 Download mii-diag.c as well. Build these.
439 439
440 a) Run 'vortex-diag -aaee' and 'mii-diag -v' when the card is 440 a) Run 'vortex-diag -aaee' and 'mii-diag -v' when the card is
441 working correctly. Save the output. 441 working correctly. Save the output.
@@ -443,8 +443,8 @@ steps you should take:
443 b) Run the above commands when the card is malfunctioning. Send 443 b) Run the above commands when the card is malfunctioning. Send
444 both sets of output. 444 both sets of output.
445 445
446Finally, please be patient and be prepared to do some work. You may end up working on 446Finally, please be patient and be prepared to do some work. You may
447this problem for a week or more as the maintainer asks more questions, asks for more 447end up working on this problem for a week or more as the maintainer
448tests, asks for patches to be applied, etc. At the end of it all, the problem may even 448asks more questions, asks for more tests, asks for patches to be
449remain unresolved. 449applied, etc. At the end of it all, the problem may even remain
450 450unresolved.
diff --git a/Documentation/power/pci.txt b/Documentation/power/pci.txt
index 6fc9d511fc39..73fc87e5dc38 100644
--- a/Documentation/power/pci.txt
+++ b/Documentation/power/pci.txt
@@ -335,5 +335,5 @@ this on the whole.
335PCI Local Bus Specification 335PCI Local Bus Specification
336PCI Bus Power Management Interface Specification 336PCI Bus Power Management Interface Specification
337 337
338 http://pcisig.org 338 http://www.pcisig.com
339 339
diff --git a/Documentation/scsi/ibmmca.txt b/Documentation/scsi/ibmmca.txt
index 2ffb3ae0ef4d..d16ce5b540f4 100644
--- a/Documentation/scsi/ibmmca.txt
+++ b/Documentation/scsi/ibmmca.txt
@@ -1108,7 +1108,7 @@
1108 A: You have to activate MCA bus support, first. 1108 A: You have to activate MCA bus support, first.
1109 Q: Where can I find the latest info about this driver? 1109 Q: Where can I find the latest info about this driver?
1110 A: See the file MAINTAINERS for the current WWW-address, which offers 1110 A: See the file MAINTAINERS for the current WWW-address, which offers
1111 updates, info and Q/A lists. At this files' origin, the webaddress 1111 updates, info and Q/A lists. At this file's origin, the webaddress
1112 was: http://www.uni-mainz.de/~langm000/linux.html 1112 was: http://www.uni-mainz.de/~langm000/linux.html
1113 Q: My SCSI-adapter is not recognized by the driver, what can I do? 1113 Q: My SCSI-adapter is not recognized by the driver, what can I do?
1114 A: Just force it to be recognized by kernel parameters. See section 5.1. 1114 A: Just force it to be recognized by kernel parameters. See section 5.1.
@@ -1248,7 +1248,7 @@
1248 -------------------- 1248 --------------------
1249 The address of the IBM SCSI-subsystem supporting WWW-page is: 1249 The address of the IBM SCSI-subsystem supporting WWW-page is:
1250 1250
1251 http://www.uni-mainz.de/~langm000/linux.html 1251 http://www.staff.uni-mainz.de/mlang/linux.html
1252 1252
1253 Here you can find info about the background of this driver, patches, 1253 Here you can find info about the background of this driver, patches,
1254 troubleshooting support, news and a bugreport form. Please check that 1254 troubleshooting support, news and a bugreport form. Please check that
diff --git a/Documentation/usb/ibmcam.txt b/Documentation/usb/ibmcam.txt
index ce2f21a3eac4..c25003644131 100644
--- a/Documentation/usb/ibmcam.txt
+++ b/Documentation/usb/ibmcam.txt
@@ -28,8 +28,8 @@ SUPPORTED CAMERAS:
28Xirlink "C-It" camera, also known as "IBM PC Camera". 28Xirlink "C-It" camera, also known as "IBM PC Camera".
29The device uses proprietary ASIC (and compression method); 29The device uses proprietary ASIC (and compression method);
30it is manufactured by Xirlink. See http://www.xirlink.com/ 30it is manufactured by Xirlink. See http://www.xirlink.com/
31http://www.ibmpccamera.com or http://www.c-itnow.com/ for 31(renamed to http://www.veo.com), http://www.ibmpccamera.com,
32details and pictures. 32or http://www.c-itnow.com/ for details and pictures.
33 33
34This very chipset ("X Chip", as marked at the factory) 34This very chipset ("X Chip", as marked at the factory)
35is used in several other cameras, and they are supported 35is used in several other cameras, and they are supported
diff --git a/Documentation/usb/ov511.txt b/Documentation/usb/ov511.txt
index e1974ec8217e..a7fc0432bff1 100644
--- a/Documentation/usb/ov511.txt
+++ b/Documentation/usb/ov511.txt
@@ -22,8 +22,8 @@ WHAT YOU NEED:
22 http://www.ovt.com/omniusbp.html 22 http://www.ovt.com/omniusbp.html
23 23
24- A Video4Linux compatible frame grabber program (I recommend vidcat and xawtv) 24- A Video4Linux compatible frame grabber program (I recommend vidcat and xawtv)
25 vidcat is part of the w3cam package: http://www.hdk-berlin.de/~rasca/w3cam/ 25 vidcat is part of the w3cam package: http://mpx.freeshell.net/
26 xawtv is available at: http://www.in-berlin.de/User/kraxel/xawtv.html 26 xawtv is available at: http://linux.bytesex.org/xawtv/
27 27
28HOW TO USE IT: 28HOW TO USE IT:
29 29
diff --git a/Documentation/usb/rio.txt b/Documentation/usb/rio.txt
index 0aa79ab0088c..ab21db454694 100644
--- a/Documentation/usb/rio.txt
+++ b/Documentation/usb/rio.txt
@@ -46,9 +46,9 @@ Contact information:
46-------------------- 46--------------------
47 47
48 The main page for the project is hosted at sourceforge.net in the following 48 The main page for the project is hosted at sourceforge.net in the following
49 address: http://rio500.sourceforge.net You can also go to the sourceforge 49 URL: <http://rio500.sourceforge.net>. You can also go to the project's
50 project page at: http://sourceforge.net/project/?group_id=1944 There is 50 sourceforge home page at: <http://sourceforge.net/projects/rio500/>.
51 also a mailing list: rio500-users@lists.sourceforge.net 51 There is also a mailing list: rio500-users@lists.sourceforge.net
52 52
53Authors: 53Authors:
54------- 54-------
diff --git a/Documentation/video4linux/zr36120.txt b/Documentation/video4linux/zr36120.txt
index 4af6c52595eb..5d6357eefde4 100644
--- a/Documentation/video4linux/zr36120.txt
+++ b/Documentation/video4linux/zr36120.txt
@@ -76,8 +76,11 @@ activates the GRAB bit. A few ms later the VSYNC (re-)rises and
76the zoran starts to work on a new and freshly broadcasted frame.... 76the zoran starts to work on a new and freshly broadcasted frame....
77 77
78For pointers I used the specs of both chips. Below are the URLs: 78For pointers I used the specs of both chips. Below are the URLs:
79 http://www.zoran.com/ftp/download/devices/pci/ZR36120/36120data.pdf 79 http://www.zoran.com/ftp/download/devices/pci/ZR36120/36120data.pdf
80 http://www-us.semiconductor.philips.com/acrobat/datasheets/SAA_7110_A_1.pdf 80 http://www-us.semiconductor.philips.com/acrobat/datasheets/SAA_7110_A_1.pdf
81Some alternatives for the Philips SAA 7110 datasheet are:
82 http://www.datasheetcatalog.com/datasheets_pdf/S/A/A/7/SAA7110.shtml
83 http://www.datasheetarchive.com/search.php?search=SAA7110&sType=part
81 84
82The documentation has very little on absolute numbers or timings 85The documentation has very little on absolute numbers or timings
83needed for the various modes/resolutions, but there are other 86needed for the various modes/resolutions, but there are other