--- ref/Makefile	2003-02-15 03:07:59.000000000 +0100
+++ x/Makefile	2003-02-15 03:06:49.000000000 +0100
@@ -97,7 +97,8 @@ export MODLIB
 CPPFLAGS := -D__KERNEL__ -I$(HPATH)
 
 CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
-	  -fno-strict-aliasing -fno-common
+	  -fno-strict-aliasing -fno-common \
+	  $(shell if $(CC) -finline-limit=2000 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-finline-limit=2000"; fi)
 ifndef CONFIG_FRAME_POINTER
 CFLAGS += -fomit-frame-pointer
 endif
--- x/fs/reiserfs/super.c.~1~	2002-11-29 02:23:16.000000000 +0100
+++ x/fs/reiserfs/super.c	2003-02-14 07:12:21.000000000 +0100
@@ -941,8 +941,8 @@ static int reread_meta_blocks(struct sup
     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 ;
     }
   }
--- x/fs/ocfs/Support/divdi3.c.~1~	2003-02-14 07:21:51.000000000 +0100
+++ x/fs/ocfs/Support/divdi3.c	2003-02-14 07:42:49.000000000 +0100
@@ -86,8 +86,7 @@ typedef union
 
 #ifdef __i386__
 #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  __asm__ ("subl %5,%1
-	sbbl %3,%0"							\
+  __asm__ ("subl %5,%1\nsbbl %3,%0"					\
 	   : "=r" ((USItype) (sh)),					\
 	     "=&r" ((USItype) (sl))					\
 	   : "0" ((USItype) (ah)),					\
--- x/drivers/scsi/aic7xxx/aic7xxx_osm.c.~1~	2002-08-09 14:52:18.000000000 +0200
+++ x/drivers/scsi/aic7xxx/aic7xxx_osm.c	2003-03-01 17:34:54.000000000 +0100
@@ -417,26 +417,7 @@ MODULE_DESCRIPTION("Adaptec Aic77XX/78XX
 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 *,