---

yaml --- r: 18596 b: refs/heads/master c: 5424570 h: refs/heads/master v: v3
git-mirror · Jan 16, 2006 · 0deafa6 · 0deafa6
1 parent 88e3c7b
commit 0deafa6
Show file tree

Hide file tree

Showing 43 changed files with 343 additions and 312 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f02d072d46bb409e8ca3cf16c0511f5c21adaf6
+refs/heads/master: 54245702ab63a9a0b1ccf78bc37b57e778bb3bcc
diff --git a/trunk/Documentation/DocBook/videobook.tmpl b/trunk/Documentation/DocBook/videobook.tmpl
@@ -229,7 +229,7 @@ int __init myradio_init(struct video_init *v)
 
 static int users = 0;
 
-static int radio_open(struct video_device *dev, int flags)
+static int radio_open(stuct video_device *dev, int flags)
 {
         if(users)
                 return -EBUSY;
@@ -949,7 +949,7 @@ int __init mycamera_init(struct video_init *v)
 
 static int users = 0;
 
-static int camera_open(struct video_device *dev, int flags)
+static int camera_open(stuct video_device *dev, int flags)
 {
         if(users)
                 return -EBUSY;

diff --git a/trunk/Documentation/cachetlb.txt b/trunk/Documentation/cachetlb.txt
@@ -136,7 +136,7 @@ changes occur:
 8) void lazy_mmu_prot_update(pte_t pte)
 	This interface is called whenever the protection on
 	any user PTEs change.  This interface provides a notification
-	to architecture specific code to take appropriate action.
+	to architecture specific code to take appropiate action.
 
 
 Next, we have the cache flushing interfaces.  In general, when Linux

diff --git a/trunk/Documentation/hpet.txt b/trunk/Documentation/hpet.txt
@@ -2,7 +2,7 @@
 
 The High Precision Event Timer (HPET) hardware is the future replacement
 for the 8254 and Real Time Clock (RTC) periodic timer functionality.
-Each HPET can have up to 32 timers.  It is possible to configure the
+Each HPET can have up two 32 timers.  It is possible to configure the
 first two timers as legacy replacements for 8254 and RTC periodic timers.
 A specification done by Intel and Microsoft can be found at
 <http://www.intel.com/hardwaredesign/hpetspec.htm>.

diff --git a/trunk/Documentation/input/ff.txt b/trunk/Documentation/input/ff.txt
@@ -120,7 +120,7 @@ to the unique id assigned by the driver. This data is required for performing
 some operations (removing an effect, controlling the playback).
 This if field must be set to -1 by the user in order to tell the driver to
 allocate a new effect.
-See <linux/input.h> for a description of the ff_effect struct. You should also
+See <linux/input.h> for a description of the ff_effect stuct. You should also
 find help in a few sketches, contained in files shape.fig and interactive.fig.
 You need xfig to visualize these files.
 

diff --git a/trunk/Documentation/ioctl/hdio.txt b/trunk/Documentation/ioctl/hdio.txt
@@ -946,7 +946,7 @@ HDIO_SCAN_HWIF			register and (re)scan interface
 
 	  This ioctl initializes the addresses and irq for a disk
 	  controller, probes for drives, and creates /proc/ide
-	  interfaces as appropriate.
+	  interfaces as appropiate.
 
 
 

diff --git a/trunk/Documentation/laptop-mode.txt b/trunk/Documentation/laptop-mode.txt
@@ -357,7 +357,7 @@ MAX_AGE=${MAX_AGE:-'600'}
 # Read-ahead, in kilobytes
 READAHEAD=${READAHEAD:-'4096'}
 
-# Shall we remount journaled fs. with appropriate commit interval? (1=yes)
+# Shall we remount journaled fs. with appropiate commit interval? (1=yes)
 DO_REMOUNTS=${DO_REMOUNTS:-'1'}
 
 # And shall we add the "noatime" option to that as well? (1=yes)

diff --git a/trunk/Documentation/networking/sk98lin.txt b/trunk/Documentation/networking/sk98lin.txt
@@ -91,7 +91,7 @@ To use the driver as a module, proceed as follows:
    with (M)
 5. Execute the command "make modules".
 6. Execute the command "make modules_install".
-   The appropriate modules will be installed.
+   The appropiate modules will be installed.
 7. Reboot your system.
 
 

diff --git a/trunk/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/trunk/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
@@ -5577,7 +5577,7 @@ struct _snd_pcm_runtime {
       <informalexample>
         <programlisting>
 <![CDATA[
-  static int mychip_suspend(struct pci_dev *pci, pm_message_t state)
+  static int mychip_suspend(strut pci_dev *pci, pm_message_t state)
   {
           /* (1) */
           struct snd_card *card = pci_get_drvdata(pci);

diff --git a/trunk/Documentation/x86_64/boot-options.txt b/trunk/Documentation/x86_64/boot-options.txt
@@ -198,6 +198,6 @@ Debugging
 
 Misc
 
-  noreplacement  Don't replace instructions with more appropriate ones
+  noreplacement  Don't replace instructions with more appropiate ones
 		 for the CPU. This may be useful on asymmetric MP systems
 		 where some CPU have less capabilities than the others.
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -549,7 +549,6 @@ S:	Maintained
 COMMON INTERNET FILE SYSTEM (CIFS)
 P:	Steve French
 M:	sfrench@samba.org
-L:	linux-cifs-client@lists.samba.org
 L:	samba-technical@lists.samba.org
 W:	http://us1.samba.org/samba/Linux_CIFS_client.html
 T:	git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
@@ -2060,7 +2059,7 @@ S:	Maintained
 POSIX CLOCKS and TIMERS
 P:	George Anzinger
 M:	george@mvista.com
-L:	linux-kernel@vger.kernel.org
+L:	netdev@vger.kernel.org
 S:	Supported
 
 POWERPC 4xx EMAC DRIVER

diff --git a/trunk/arch/i386/kernel/vm86.c b/trunk/arch/i386/kernel/vm86.c
@@ -4,7 +4,7 @@
  *  Copyright (C) 1994  Linus Torvalds
  *
  *  29 dec 2001 - Fixed oopses caused by unchecked access to the vm86
- *                stack - Manfred Spraul <manfred@colorfullife.com>
+ *                stack - Manfred Spraul <manfreds@colorfullife.com>
  *
  *  22 mar 2002 - Manfred detected the stackfaults, but didn't handle
  *                them correctly. Now the emulation will be in a

diff --git a/trunk/arch/um/include/sysdep-i386/checksum.h b/trunk/arch/um/include/sysdep-i386/checksum.h
@@ -36,7 +36,7 @@ unsigned int csum_partial_copy_nocheck(const unsigned char *src, unsigned char *
 				       int len, int sum)
 {
 	memcpy(dst, src, len);
-	return csum_partial(dst, len, sum);
+	return(csum_partial(dst, len, sum));
 }
 
 /*
@@ -104,7 +104,7 @@ static inline unsigned short ip_fast_csum(unsigned char * iph,
 	: "=r" (sum), "=r" (iph), "=r" (ihl)
 	: "1" (iph), "2" (ihl)
 	: "memory");
-	return sum;
+	return(sum);
 }
 
 /*

diff --git a/trunk/drivers/block/floppy.c b/trunk/drivers/block/floppy.c
@@ -242,6 +242,7 @@ static int allowed_drive_mask = 0x33;
 
 static int irqdma_allocated;
 
+#define LOCAL_END_REQUEST
 #define DEVICE_NAME "floppy"
 
 #include <linux/blkdev.h>

diff --git a/trunk/drivers/char/Kconfig b/trunk/drivers/char/Kconfig
@@ -881,6 +881,16 @@ config FTAPE
 	  module. To compile this driver as a module, choose M here: the
 	  module will be called ftape.
 
+	  Note that the Ftape-HOWTO is out of date (sorry) and documents the
+	  older version 2.08 of this software but still contains useful
+	  information.  There is a web page with more recent documentation at
+	  <http://www.instmath.rwth-aachen.de/~heine/ftape/>.  This page
+	  always contains the latest release of the ftape driver and useful
+	  information (backup software, ftape related patches and
+	  documentation, FAQ).  Note that the file system interface has
+	  changed quite a bit compared to previous versions of ftape.  Please
+	  read <file:Documentation/ftape.txt>.
+
 source "drivers/char/ftape/Kconfig"
 
 endmenu

diff --git a/trunk/drivers/char/ftape/Kconfig b/trunk/drivers/char/ftape/Kconfig
@@ -25,7 +25,17 @@ config ZFTAPE
 	  support", above) then `zft-compressor' will be loaded
 	  automatically by zftape when needed.
 
-	  Despite its name, zftape does NOT use compression by default.
+	  Despite its name, zftape does NOT use compression by default.  The
+	  file <file:Documentation/ftape.txt> contains a short description of
+	  the most important changes in the file system interface compared to
+	  previous versions of ftape.  The ftape home page
+	  <http://www.instmath.rwth-aachen.de/~heine/ftape/> contains
+	  further information.
+
+	  IMPORTANT NOTE: zftape can read archives created by previous
+	  versions of ftape and provide file mark support (i.e. fast skipping
+	  between tape archives) but previous version of ftape will lack file
+	  mark support when reading archives produced by zftape.
 
 config ZFT_DFLT_BLK_SZ
 	int "Default block size"