diff --exclude mm -Niur linux-2.4.20-oM3-orig/drivers/ide/ide-cd.h linux-2.4.20-oM3-mod/drivers/ide/ide-cd.h
--- linux-2.4.20-oM3-orig/drivers/ide/ide-cd.h	Sat Aug  3 02:39:44 2002
+++ linux-2.4.20-oM3-mod/drivers/ide/ide-cd.h	Wed Mar 31 14:51:35 2004
@@ -437,7 +437,7 @@
 
 	byte     curlba[3];
 	byte     nslots;
-	__u8 short slot_tablelen;
+	__u16 slot_tablelen;
 };
 
 
diff --exclude mm -Niur linux-2.4.20-oM3-orig/drivers/scsi/aic7xxx/aic7xxx_osm.c linux-2.4.20-oM3-mod/drivers/scsi/aic7xxx/aic7xxx_osm.c
--- linux-2.4.20-oM3-orig/drivers/scsi/aic7xxx/aic7xxx_osm.c	Sat Aug  3 02:39:44 2002
+++ linux-2.4.20-oM3-mod/drivers/scsi/aic7xxx/aic7xxx_osm.c	Wed Mar 31 14:50:58 2004
@@ -417,26 +417,26 @@
 MODULE_LICENSE("Dual BSD/GPL");
 #endif
 MODULE_PARM(aic7xxx, "s");
-MODULE_PARM_DESC(aic7xxx, "period delimited, options string.
-	verbose			Enable verbose/diagnostic logging
-	no_probe		Disable EISA/VLB controller probing
-	no_reset		Supress initial bus resets
-	extended		Enable extended geometry on all controllers
-	periodic_otag		Send an ordered tagged transaction periodically
-				to prevent tag starvation.  This may be
-				required by some older disk drives/RAID arrays. 
-	reverse_scan		Sort PCI devices highest Bus/Slot to lowest
-	tag_info:<tag_str>	Set per-target tag depth
-	seltime:<int>		Selection Timeout(0/256ms,1/128ms,2/64ms,3/32ms)
-
-	Sample /etc/modules.conf line:
-		Enable verbose logging
-		Disable EISA/VLB probing
-		Set tag depth on Controller 2/Target 2 to 10 tags
-		Shorten the selection timeout to 128ms from its default of 256
-
-	options aic7xxx='\"verbose.no_probe.tag_info:{{}.{}.{..10}}.seltime:1\"'
-");
+MODULE_PARM_DESC(aic7xxx, "period delimited, options string.\n"
+"	verbose			Enable verbose/diagnostic logging\n"
+"	no_probe		Disable EISA/VLB controller probing\n"
+"	no_reset		Supress initial bus resets\n"
+"	extended		Enable extended geometry on all controllers\n"
+"	periodic_otag		Send an ordered tagged transaction periodically\n"
+"				to prevent tag starvation.  This may be\n"
+"				required by some older disk drives/RAID arrays.\n"
+"	reverse_scan		Sort PCI devices highest Bus/Slot to lowest\n"
+"	tag_info:<tag_str>	Set per-target tag depth\n"
+"	seltime:<int>		Selection Timeout(0/256ms,1/128ms,2/64ms,3/32ms)\n"
+"\n"
+"	Sample /etc/modules.conf line:\n"
+"		Enable verbose logging\n"
+"		Disable EISA/VLB probing\n"
+"		Set tag depth on Controller 2/Target 2 to 10 tags\n"
+"		Shorten the selection timeout to 128ms from its default of 256\n"
+"\n"
+"	options aic7xxx='verbose.no_probe.tag_info:{{}.{}.{..10}}.seltime:1'\n"
+);
 #endif
 
 static void ahc_linux_handle_scsi_status(struct ahc_softc *,
diff --exclude mm -Niur linux-2.4.20-oM3-orig/fs/reiserfs/super.c linux-2.4.20-oM3-mod/fs/reiserfs/super.c
--- linux-2.4.20-oM3-orig/fs/reiserfs/super.c	Fri Nov 29 00:53:15 2002
+++ linux-2.4.20-oM3-mod/fs/reiserfs/super.c	Wed Mar 31 14:52:29 2004
@@ -941,8 +941,8 @@
     ll_rw_block(READ, 1, &(SB_AP_BITMAP(s)[i].bh)) ;
     wait_on_buffer(SB_AP_BITMAP(s)[i].bh) ;
     if (!buffer_uptodate(SB_AP_BITMAP(s)[i].bh)) {
-      printk("reread_meta_blocks, error reading bitmap block number %d at
-      %ld\n", i, SB_AP_BITMAP(s)[i].bh->b_blocknr) ;
+      printk("reread_meta_blocks, error reading bitmap block number %d at%ld\n",
+		i, SB_AP_BITMAP(s)[i].bh->b_blocknr) ;
       return 1 ;
     }
   }
diff --exclude mm -Niur linux-2.4.20-oM3-orig/net/core/rtnetlink.c linux-2.4.20-oM3-mod/net/core/rtnetlink.c
--- linux-2.4.20-oM3-orig/net/core/rtnetlink.c	Fri Nov 29 00:53:15 2002
+++ linux-2.4.20-oM3-mod/net/core/rtnetlink.c	Wed Mar 31 14:52:57 2004
@@ -394,7 +394,7 @@
  * Malformed skbs with wrong lengths of messages are discarded silently.
  */
 
-extern __inline__ int rtnetlink_rcv_skb(struct sk_buff *skb)
+static __inline__ int rtnetlink_rcv_skb(struct sk_buff *skb)
 {
 	int err;
 	struct nlmsghdr * nlh;