## Automatically generated incremental diff
## From:   linux-2.0.39-pre5
## To:     linux-2.0.39-pre6
## Robot:  $Id: make-incremental-diff,v 1.11 2002/02/20 02:59:33 hpa Exp $

diff -urN linux-2.0.39-pre5/drivers/block/ide.c linux-2.0.39-pre6/drivers/block/ide.c
--- linux-2.0.39-pre5/drivers/block/ide.c	2003-08-15 15:04:59.000000000 -0700
+++ linux-2.0.39-pre6/drivers/block/ide.c	2003-08-15 15:04:59.000000000 -0700
@@ -1663,7 +1663,7 @@
 #else
 		do_rw_disk (drive, rq, block); /* simpler and faster */
 		return;
-#endif /* CONFIG_BLK_DEV_IDEATAPI */;
+#endif /* CONFIG_BLK_DEV_IDEATAPI */
 	}
 	do_special(drive);
 	return;
diff -urN linux-2.0.39-pre5/drivers/block/paride/pseudo.h linux-2.0.39-pre6/drivers/block/paride/pseudo.h
--- linux-2.0.39-pre5/drivers/block/paride/pseudo.h	2003-08-15 15:04:59.000000000 -0700
+++ linux-2.0.39-pre6/drivers/block/paride/pseudo.h	2003-08-15 15:04:59.000000000 -0700
@@ -1,4 +1,4 @@
-/* 
+/*
         pseudo.h    (c) 1997-8  Grant R. Guenther <grant@torque.net>
                                 Under the terms of the GNU public license.
 
@@ -20,7 +20,7 @@
 	jiffy.  If nice is 0, the test will also be done whenever
 	the scheduler runs (by adding it to a task queue).  If
 	nice is greater than 1, the test will be done once every
-	(nice-1) jiffies. 
+	(nice-1) jiffies.
 
 */
 
@@ -29,7 +29,7 @@
 	1.01	1998.05.03	Switched from cli()/sti() to spinlocks
 	1.02    1998.12.14      Added support for nice > 1
 */
-	
+
 #define PS_VERSION	"1.02"
 
 #include <linux/sched.h>
@@ -52,11 +52,11 @@
 static struct timer_list ps_timer = {0,0,0,0,ps_timer_int};
 static struct tq_struct ps_tq = {0,0,ps_tq_int,NULL};
 
-static void ps_set_intr( void (*continuation)(void), 
+static void ps_set_intr( void (*continuation)(void),
 			 int (*ready)(void),
 			 int timeout, int nice )
-
-{       long	flags;
+{
+	long flags;
 
 	spin_lock_irqsave(&ps_spinlock,flags);
 
@@ -84,8 +84,8 @@
 }
 
 static void ps_tq_int( void *data )
-
-{       void (*con)(void);
+{
+	void (*con)(void);
 	long flags;
 
 	spin_lock_irqsave(&ps_spinlock,flags);
@@ -104,7 +104,7 @@
 	}
         if (!ps_ready || ps_ready() || (jiffies >= ps_timeout)) {
                 ps_continuation = NULL;
-        	spin_unlock_irqrestore(&ps_spinlock,flags);
+		spin_unlock_irqrestore(&ps_spinlock,flags);
                 con();
                 return;
                 }
@@ -119,9 +119,9 @@
 }
 
 static void ps_timer_int( unsigned long data)
-
-{       void (*con)(void);
-	long	flags;
+{
+	void (*con)(void);
+	long flags;
 
 	spin_lock_irqsave(&ps_spinlock,flags);
 
@@ -138,10 +138,9 @@
 		return;
 		}
 	ps_timer_active = 1;
-        ps_timer.expires = jiffies + (ps_nice>0)?(ps_nice-1):0;
+        ps_timer.expires = jiffies + ((ps_nice>0)?(ps_nice-1):0);
         add_timer(&ps_timer);
         spin_unlock_irqrestore(&ps_spinlock,flags);
 }
 
 /* end of pseudo.h */
-
diff -urN linux-2.0.39-pre5/fs/ext2/super.c linux-2.0.39-pre6/fs/ext2/super.c
--- linux-2.0.39-pre5/fs/ext2/super.c	2003-08-15 15:04:59.000000000 -0700
+++ linux-2.0.39-pre6/fs/ext2/super.c	2003-08-15 15:04:59.000000000 -0700
@@ -124,7 +124,7 @@
 	return;
 }
 
-static struct super_operations ext2_sops = { 
+static struct super_operations ext2_sops = {
 	ext2_read_inode,
 	NULL,
 	ext2_write_inode,
@@ -415,22 +415,22 @@
 	if (es->s_rev_level > EXT2_GOOD_OLD_REV) {
 		if (es->s_feature_incompat & ~EXT2_FEATURE_INCOMPAT_SUPP) {
 			printk("EXT2-fs: %s: couldn't mount because of "
-			       "unsupported optional features.\n", 
+			       "unsupported optional features.\n",
 			       kdevname(dev));
 			goto failed_mount;
 		}
 		if (!(sb->s_flags & MS_RDONLY) &&
 		    (es->s_feature_ro_compat & ~EXT2_FEATURE_RO_COMPAT_SUPP)) {
 			printk("EXT2-fs: %s: couldn't mount RDWR because of "
-			       "unsupported optional features.\n", 
+			       "unsupported optional features.\n",
 			       kdevname(dev));
 			goto failed_mount;
 		}
 	}
 	sb->s_blocksize_bits = sb->u.ext2_sb.s_es->s_log_block_size + 10;
 	sb->s_blocksize = 1 << sb->s_blocksize_bits;
-	if (sb->s_blocksize != BLOCK_SIZE && 
-	    (sb->s_blocksize == 1024 || sb->s_blocksize == 2048 ||  
+	if (sb->s_blocksize != BLOCK_SIZE &&
+	    (sb->s_blocksize == 1024 || sb->s_blocksize == 2048 ||
 	     sb->s_blocksize == 4096)) {
 		unsigned long offset;
 
@@ -672,7 +672,7 @@
 	else {
 		/*
 		 * Mounting a RDONLY partition read-write, so reread and
-		 * store the current valid flag.  (It may have been changed 
+		 * store the current valid flag.  (It may have been changed
 		 * by e2fsck since we originally mounted the partition.)
 		 */
 		sb->u.ext2_sb.s_mount_state = es->s_state;