r1019 - trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches

Joshua Kwan joshk@haydn.debian.org
Wed, 11 Aug 2004 16:10:21 -0600


Author: joshk
Date: 2004-08-11 16:10:03 -0600 (Wed, 11 Aug 2004)
New Revision: 1019

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/035_epatc8_runtime.diff
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/036_soundmodem_static.diff
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/037_pm768_cond.diff
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/038_i810_dma_workaround.diff
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/039_ibmtr_dupe_fix.diff
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/040_via-rhine_port_size.diff
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/041_7xxxosm_deadlock.diff
Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1
Log:
this is a fucking huge patch kthxbye


Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/035_epatc8_runtime.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/035_epatc8_runtime.diff	2004-08-11 22:01:02 UTC (rev 1018)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/035_epatc8_runtime.diff	2004-08-11 22:10:03 UTC (rev 1019)
@@ -0,0 +1,64 @@
+diff -urN kernel-source-2.4.26/drivers/block/paride/epat.c kernel-source-2.4.26-1/drivers/block/paride/epat.c
+--- kernel-source-2.4.26/drivers/block/paride/epat.c	2002-11-29 10:53:12.000000000 +1100
++++ kernel-source-2.4.26-1/drivers/block/paride/epat.c	2002-11-30 16:25:11.000000000 +1100
+@@ -30,6 +30,14 @@
+ #define j44(a,b)		(((a>>4)&0x0f)+(b&0xf0))
+ #define j53(a,b)		(((a>>3)&0x1f)+((b<<4)&0xe0))
+ 
++#ifdef CONFIG_PARIDE_EPATC8
++static int epatc8 = 1;
++#else
++static int epatc8;
++#endif
++
++MODULE_PARM(epatc8,"i");
++
+ /* cont =  0   IDE register file
+    cont =  1   IDE control registers
+    cont =  2   internal EPAT registers
+@@ -208,15 +216,18 @@
+ {       pi->saved_r0 = r0();
+         pi->saved_r2 = r2();
+ 
+-#ifdef CONFIG_PARIDE_EPATC8
+  	/* Initialize the chip */
+-        CPP(0);CPP(0x40);CPP(0xe0);              
+-        w0(0);w2(1);w2(4);
+-        WR(0x8,0x12);WR(0xc,0x14);WR(0x12,0x10);
+-        WR(0xe,0xf);WR(0xf,4);
+-     /* WR(0xe,0xa);WR(0xf,4); */
+-        WR(0xe,0xd);WR(0xf,0);
+-     /* CPP(0x30); */
++	CPP(0);
++
++	if (epatc8) {
++		CPP(0x40);CPP(0xe0);              
++		w0(0);w2(1);w2(4);
++		WR(0x8,0x12);WR(0xc,0x14);WR(0x12,0x10);
++		WR(0xe,0xf);WR(0xf,4);
++		/* WR(0xe,0xa);WR(0xf,4); */
++		WR(0xe,0xd);WR(0xf,0);
++		/* CPP(0x30); */
++	}
+ 
+         /* Connect to the chip */
+ 	CPP(0xe0);
+@@ -226,15 +237,10 @@
+           /* Request EPP */
+           w0(0x40);w2(6);w2(7);w2(4);w2(0xc);w2(4);
+         }
+-#else
+- 	CPP(0); CPP(0xe0);
+-	w0(0); w2(1); w2(4);
+-	if (pi->mode >= 3) {
+-		w0(0); w2(1); w2(4); w2(0xc);
+-		w0(0x40); w2(6); w2(7); w2(4); w2(0xc); w2(4);
++
++	if (!epatc8) {
++		WR(8,0x10); WR(0xc,0x14); WR(0xa,0x38); WR(0x12,0x10);
+ 	}
+-	WR(8,0x10); WR(0xc,0x14); WR(0xa,0x38); WR(0x12,0x10);
+-#endif
+ }
+ 
+ static void epat_disconnect (PIA *pi)

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/036_soundmodem_static.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/036_soundmodem_static.diff	2004-08-11 22:01:02 UTC (rev 1018)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/036_soundmodem_static.diff	2004-08-11 22:10:03 UTC (rev 1019)
@@ -0,0 +1,24 @@
+diff -urN kernel-source-2.4.26/drivers/net/hamradio/soundmodem/sm.h kernel-source-2.4.26-1/drivers/net/hamradio/soundmodem/sm.h
+--- kernel-source-2.4.26/drivers/net/hamradio/soundmodem/sm.h	2002-08-03 10:39:44.000000000 +1000
++++ kernel-source-2.4.26-1/drivers/net/hamradio/soundmodem/sm.h	2002-03-06 19:49:48.000000000 +1100
+@@ -363,7 +363,7 @@
+ 
+ /* --------------------------------------------------------------------- */
+ 
+-extern void inline sm_int_freq(struct sm_state *sm)
++static void inline sm_int_freq(struct sm_state *sm)
+ {
+ #ifdef SM_DEBUG
+ 	unsigned long cur_jiffies = jiffies;
+diff -urN kernel-source-2.4.26/drivers/net/hamradio/soundmodem/sm_wss.c kernel-source-2.4.26-1/drivers/net/hamradio/soundmodem/sm_wss.c
+--- kernel-source-2.4.26/drivers/net/hamradio/soundmodem/sm_wss.c	2002-11-29 10:53:13.000000000 +1100
++++ kernel-source-2.4.26-1/drivers/net/hamradio/soundmodem/sm_wss.c	2002-11-30 15:49:40.000000000 +1100
+@@ -100,7 +100,7 @@
+ 
+ /* --------------------------------------------------------------------- */
+ 
+-extern void inline wss_ack_int(struct net_device *dev)
++static void inline wss_ack_int(struct net_device *dev)
+ {
+ 	outb(0, WSS_CODEC_STATUS(dev->base_addr));
+ }

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/037_pm768_cond.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/037_pm768_cond.diff	2004-08-11 22:01:02 UTC (rev 1018)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/037_pm768_cond.diff	2004-08-11 22:10:03 UTC (rev 1019)
@@ -0,0 +1,20 @@
+diff -urN kernel-source-2.4.26/drivers/char/Config.in kernel-source-2.4.26-1/drivers/char/Config.in
+--- kernel-source-2.4.26/drivers/char/Config.in	2004-02-19 00:36:31.000000000 +1100
++++ kernel-source-2.4.26-1/drivers/char/Config.in	2004-02-22 20:28:14.000000000 +1100
+@@ -297,6 +297,7 @@
+ 
+ if [ "$CONFIG_X86" = "y" -o "$CONFIG_X86_64" = "y" ]; then
+    dep_tristate 'AMD 768/8111 Random Number Generator support' CONFIG_AMD_RNG $CONFIG_PCI
++   dep_tristate 'AMD 76x native power management (Experimental)' CONFIG_AMD_PM768 $CONFIG_PCI
+ fi
+ if [ "$CONFIG_X86" = "y" -o "$CONFIG_IA64" = "y" ]; then
+    dep_tristate 'Intel i8x0 Random Number Generator support' CONFIG_INTEL_RNG $CONFIG_PCI
+@@ -305,7 +306,6 @@
+      "$CONFIG_X86_64" = "y" ]; then
+    dep_tristate 'Intel/AMD/VIA HW Random Number Generator support' CONFIG_HW_RANDOM $CONFIG_PCI
+ fi
+-dep_tristate 'AMD 76x native power management (Experimental)' CONFIG_AMD_PM768 $CONFIG_PCI
+ tristate '/dev/nvram support' CONFIG_NVRAM
+ tristate 'Enhanced Real Time Clock Support' CONFIG_RTC
+ if [ "$CONFIG_IA64" = "y" ]; then
+ 

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/038_i810_dma_workaround.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/038_i810_dma_workaround.diff	2004-08-11 22:01:02 UTC (rev 1018)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/038_i810_dma_workaround.diff	2004-08-11 22:10:03 UTC (rev 1019)
@@ -0,0 +1,14 @@
+diff -urN kernel-source-2.4.26/drivers/char/drm/i810_dma.c kernel-source-2.4.26-1/drivers/char/drm/i810_dma.c
+--- kernel-source-2.4.26/drivers/char/drm/i810_dma.c	2004-02-19 00:36:31.000000000 +1100
++++ kernel-source-2.4.26-1/drivers/char/drm/i810_dma.c	2004-02-22 20:28:16.000000000 +1100
+@@ -335,6 +335,10 @@
+ 
+    	ring->head = I810_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
+      	ring->tail = I810_READ(LP_RING + RING_TAIL);
++     	if ((int)ring->tail < 0) {
++     		DRM_ERROR("buggy X server: ring->tail = %u\n", ring->tail);
++     		ring->tail = ring->head;
++     	}
+      	ring->space = ring->head - (ring->tail+8);
+      	if (ring->space < 0) ring->space += ring->Size;
+ }

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/039_ibmtr_dupe_fix.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/039_ibmtr_dupe_fix.diff	2004-08-11 22:01:02 UTC (rev 1018)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/039_ibmtr_dupe_fix.diff	2004-08-11 22:10:03 UTC (rev 1019)
@@ -0,0 +1,30 @@
+diff -urN kernel-source-2.4.26/drivers/net/tokenring/ibmtr.c kernel-source-2.4.26-1/drivers/net/tokenring/ibmtr.c
+--- kernel-source-2.4.26/drivers/net/tokenring/ibmtr.c	2001-11-10 09:02:24.000000000 +1100
++++ kernel-source-2.4.26-1/drivers/net/tokenring/ibmtr.c	2003-03-22 12:13:25.000000000 +1100
+@@ -330,7 +330,10 @@
+ 	for (i = 0; ibmtr_portlist[i]; i++) {
+ 		int ioaddr = ibmtr_portlist[i];
+ 
++		if (!request_region(ioaddr, IBMTR_IO_EXTENT, "ibmtr"))
++			continue;
+ 		if (!ibmtr_probe1(dev, ioaddr)) return 0;
++		release_region(ioaddr, IBMTR_IO_EXTENT);
+ 	}
+ 	return -ENODEV;
+ }
+@@ -669,15 +672,6 @@
+ 		kfree(ti);
+ 		return -ENODEV;
+ 	}
+-	/*?? Now, allocate some of the PIO PORTs for this driver.. */
+-	/* record PIOaddr range as busy */
+-	if (!request_region(PIOaddr, IBMTR_IO_EXTENT, "ibmtr")) {
+-		DPRINTK("Could not grab PIO range. Halting driver.\n");
+-		free_irq(dev->irq, dev);
+-		iounmap(t_mmio);
+-		kfree(ti);
+-		return -EBUSY;
+-	}
+ 
+ 	if (!version_printed++) {
+ 		printk(version);

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/040_via-rhine_port_size.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/040_via-rhine_port_size.diff	2004-08-11 22:01:02 UTC (rev 1018)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/040_via-rhine_port_size.diff	2004-08-11 22:10:03 UTC (rev 1019)
@@ -0,0 +1,13 @@
+diff -urN kernel-source-2.4.26/drivers/net/via-rhine.c kernel-source-2.4.26-1/drivers/net/via-rhine.c
+--- kernel-source-2.4.26/drivers/net/via-rhine.c	2003-11-29 05:26:20.000000000 +1100
++++ kernel-source-2.4.26-1/drivers/net/via-rhine.c	2003-11-29 20:53:36.000000000 +1100
+@@ -523,8 +523,8 @@
+ 	u16 chip_cmd;						/* Current setting for ChipCmd */
+ 
+ 	/* These values are keep track of the transceiver/media in use. */
+-	unsigned int default_port:4;		/* Last dev->if_port value. */
+ 	u8 tx_thresh, rx_thresh;
++	unsigned int default_port;		/* Last dev->if_port value. */
+ 
+ 	/* MII transceiver section. */
+ 	unsigned char phys[MAX_MII_CNT];			/* MII device addresses. */

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/041_7xxxosm_deadlock.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/041_7xxxosm_deadlock.diff	2004-08-11 22:01:02 UTC (rev 1018)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/041_7xxxosm_deadlock.diff	2004-08-11 22:10:03 UTC (rev 1019)
@@ -0,0 +1,40 @@
+diff -urN kernel-source-2.4.26/drivers/scsi/aic7xxx/aic7xxx_osm.c kernel-source-2.4.26-1/drivers/scsi/aic7xxx/aic7xxx_osm.c
+--- kernel-source-2.4.26/drivers/scsi/aic7xxx/aic7xxx_osm.c	2003-11-29 05:26:20.000000000 +1100
++++ kernel-source-2.4.26-1/drivers/scsi/aic7xxx/aic7xxx_osm.c	2004-02-18 18:52:27.000000000 +1100
+@@ -3990,11 +3990,10 @@
+ }
+ 
+ static void
+-ahc_linux_free_device(struct ahc_softc *ahc, struct ahc_linux_device *dev)
++__ahc_linux_free_device(struct ahc_softc *ahc, struct ahc_linux_device *dev)
+ {
+ 	struct ahc_linux_target *targ;
+ 
+-	del_timer_sync(&dev->timer);
+ 	targ = dev->target;
+ 	targ->devices[dev->lun] = NULL;
+ 	free(dev, M_DEVBUF);
+@@ -4004,6 +4003,13 @@
+ 		ahc_linux_free_target(ahc, targ);
+ }
+ 
++static void
++ahc_linux_free_device(struct ahc_softc *ahc, struct ahc_linux_device *dev)
++{
++	del_timer_sync(&dev->timer);
++	__ahc_linux_free_device(ahc, dev);
++}
++
+ void
+ ahc_send_async(struct ahc_softc *ahc, char channel,
+ 	       u_int target, u_int lun, ac_code code, void *arg)
+@@ -4703,7 +4709,7 @@
+ 		ahc_linux_run_device_queue(ahc, dev);
+ 	if (TAILQ_EMPTY(&dev->busyq)
+ 	 && dev->active == 0)
+-		ahc_linux_free_device(ahc, dev);
++		__ahc_linux_free_device(ahc, dev);
+ 	ahc_unlock(ahc, &s);
+ }
+ 
+

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1	2004-08-11 22:01:02 UTC (rev 1018)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1	2004-08-11 22:10:03 UTC (rev 1019)
@@ -390,17 +390,11 @@
 +* Always call complete after unlinking an urb in drivers/usb/host/usb-ohci.c.
 +* Set time fields to zero in fs/cramfs/inode.c.
 +* Fixed umsdos_solve_hlink oops in fs/umsdos/dir.c.
-+* Made CONFIG_PARIDE_EPATC8 into a runtime option.
 +* Removed CONFIG_INET_ECN check in net/ipv4/tcp_diag.c.
 +* Added dependency on MTD_CONCAT for sc520cdp in drivers/mtd/maps/Config.in.
 +* Fixed printk warnings in init/do_mounts.c.
 +* Fixed dupliate detection problem in drivers/net/tokenring/ibmtr.c.
 +* Changed all occurances of infobox+sleep to msgbox in scripts/Menuconfig.
-+* Fixed size of default_port in drivers/net/via-rhine.c.
-+* Paper over X server bug in drivers/char/drm/i810_dma.c.
-+* Use seq interface for /proc/modules:
-+  . fs/proc/proc_misc.c
-+  . kernel/module.c
 +* Include linux/socket.h in include/linux/netlink.h (2.5).
 +* Include linux/skbuff.h for skb_put in include/linux/netlink.h.
 +* Include linux/spinlock.h for spinlock_t in include/linux/interrupt.h.
@@ -422,7 +416,6 @@
 +* Removed -Werror in drivers/scsi/aic7xxx/Makefile.
 +* Do not unshare files for pid == 1 in kernel/fork.c.
 +* Fixed wrong address in ICMP log entry in net/ipv4/icmp.c (2.5).
-+* Made AMD_PM768 conditional on X86/X86_64 in drivers/char/Config.in.
 +* Fixed DMA overruns/bugs in drivers/sound/i810_audio.c.
 +* Fixed dev timer SMP deadlock in drivers/scsi/aic7xxx/aic7xxx_osm.c
 +  (Andrew Morton).
@@ -432,30 +425,8 @@
 +
 +Changes to comments and documentation:
 +
-+* Fixed typos (Carlos Valdivia Yagüe):
-+  . Documentation/sound/VIBRA16
-+  . Documentation/sound/OPL3-SA
-+* Fixed a typo in Documentation/sound/Introduction (Daniel van Eeden).
-+* Fixed comment about epochs in arch/alpha/kernel/time.c.
-+* Commented out non-TeX heading in Documentation/smp.tex (Daniel van Eeden).
 +* Removed bogus devfs references in Documentation/initrd.txt (Nikolaus Rath).
-+* Fixed typos (Jochen Voss):
-+  . drivers/s390/block/xpram.c
-+  . Documentation/usb/sl811hc.txt
 +
-+Non-free bits removed:
-+
-+* Keyspan firmware.
-+* SMC Token Ring firmware, driver disabled.
-+* ACENIC firwmare, driver disabled.
-+* DGRS firmware, driver disabled.
-+* DAB firmware, driver disabled.
-+* Unused firmware:
-+  . drivers/sound/724hwmcode.h
-+  . drivers/sound/Hwmcode.h
-+
-+Herbert Xu <herbert@debian.org>
-+$Id: README.Debian,v 1.100 2004/04/18 08:25:37 herbert Exp $
 diff -urN kernel-source-2.4.26/arch/alpha/defconfig kernel-source-2.4.26-1/arch/alpha/defconfig
 --- kernel-source-2.4.26/arch/alpha/defconfig	2004-02-19 00:36:30.000000000 +1100
 +++ kernel-source-2.4.26-1/arch/alpha/defconfig	2004-04-17 13:32:34.000000000 +1000
@@ -1460,104 +1431,7 @@
    tristate       '  Testing module' CONFIG_CRYPTO_TEST
  fi
 
-diff -urN kernel-source-2.4.26/drivers/block/paride/epat.c kernel-source-2.4.26-1/drivers/block/paride/epat.c
---- kernel-source-2.4.26/drivers/block/paride/epat.c	2002-11-29 10:53:12.000000000 +1100
-+++ kernel-source-2.4.26-1/drivers/block/paride/epat.c	2002-11-30 16:25:11.000000000 +1100
-@@ -30,6 +30,14 @@
- #define j44(a,b)		(((a>>4)&0x0f)+(b&0xf0))
- #define j53(a,b)		(((a>>3)&0x1f)+((b<<4)&0xe0))
- 
-+#ifdef CONFIG_PARIDE_EPATC8
-+static int epatc8 = 1;
-+#else
-+static int epatc8;
-+#endif
-+
-+MODULE_PARM(epatc8,"i");
-+
- /* cont =  0   IDE register file
-    cont =  1   IDE control registers
-    cont =  2   internal EPAT registers
-@@ -208,15 +216,18 @@
- {       pi->saved_r0 = r0();
-         pi->saved_r2 = r2();
- 
--#ifdef CONFIG_PARIDE_EPATC8
-  	/* Initialize the chip */
--        CPP(0);CPP(0x40);CPP(0xe0);              
--        w0(0);w2(1);w2(4);
--        WR(0x8,0x12);WR(0xc,0x14);WR(0x12,0x10);
--        WR(0xe,0xf);WR(0xf,4);
--     /* WR(0xe,0xa);WR(0xf,4); */
--        WR(0xe,0xd);WR(0xf,0);
--     /* CPP(0x30); */
-+	CPP(0);
-+
-+	if (epatc8) {
-+		CPP(0x40);CPP(0xe0);              
-+		w0(0);w2(1);w2(4);
-+		WR(0x8,0x12);WR(0xc,0x14);WR(0x12,0x10);
-+		WR(0xe,0xf);WR(0xf,4);
-+		/* WR(0xe,0xa);WR(0xf,4); */
-+		WR(0xe,0xd);WR(0xf,0);
-+		/* CPP(0x30); */
-+	}
- 
-         /* Connect to the chip */
- 	CPP(0xe0);
-@@ -226,15 +237,10 @@
-           /* Request EPP */
-           w0(0x40);w2(6);w2(7);w2(4);w2(0xc);w2(4);
-         }
--#else
-- 	CPP(0); CPP(0xe0);
--	w0(0); w2(1); w2(4);
--	if (pi->mode >= 3) {
--		w0(0); w2(1); w2(4); w2(0xc);
--		w0(0x40); w2(6); w2(7); w2(4); w2(0xc); w2(4);
-+
-+	if (!epatc8) {
-+		WR(8,0x10); WR(0xc,0x14); WR(0xa,0x38); WR(0x12,0x10);
- 	}
--	WR(8,0x10); WR(0xc,0x14); WR(0xa,0x38); WR(0x12,0x10);
--#endif
- }
- 
- static void epat_disconnect (PIA *pi)
-diff -urN kernel-source-2.4.26/drivers/char/Config.in kernel-source-2.4.26-1/drivers/char/Config.in
---- kernel-source-2.4.26/drivers/char/Config.in	2004-02-19 00:36:31.000000000 +1100
-+++ kernel-source-2.4.26-1/drivers/char/Config.in	2004-02-22 20:28:14.000000000 +1100
-@@ -297,6 +297,7 @@
- 
- if [ "$CONFIG_X86" = "y" -o "$CONFIG_X86_64" = "y" ]; then
-    dep_tristate 'AMD 768/8111 Random Number Generator support' CONFIG_AMD_RNG $CONFIG_PCI
-+   dep_tristate 'AMD 76x native power management (Experimental)' CONFIG_AMD_PM768 $CONFIG_PCI
- fi
- if [ "$CONFIG_X86" = "y" -o "$CONFIG_IA64" = "y" ]; then
-    dep_tristate 'Intel i8x0 Random Number Generator support' CONFIG_INTEL_RNG $CONFIG_PCI
-@@ -305,7 +306,6 @@
-      "$CONFIG_X86_64" = "y" ]; then
-    dep_tristate 'Intel/AMD/VIA HW Random Number Generator support' CONFIG_HW_RANDOM $CONFIG_PCI
- fi
--dep_tristate 'AMD 76x native power management (Experimental)' CONFIG_AMD_PM768 $CONFIG_PCI
- tristate '/dev/nvram support' CONFIG_NVRAM
- tristate 'Enhanced Real Time Clock Support' CONFIG_RTC
- if [ "$CONFIG_IA64" = "y" ]; then
- 
-diff -urN kernel-source-2.4.26/drivers/char/drm/i810_dma.c kernel-source-2.4.26-1/drivers/char/drm/i810_dma.c
---- kernel-source-2.4.26/drivers/char/drm/i810_dma.c	2004-02-19 00:36:31.000000000 +1100
-+++ kernel-source-2.4.26-1/drivers/char/drm/i810_dma.c	2004-02-22 20:28:16.000000000 +1100
-@@ -335,6 +335,10 @@
- 
-    	ring->head = I810_READ(LP_RING + RING_HEAD) & HEAD_ADDR;
-      	ring->tail = I810_READ(LP_RING + RING_TAIL);
-+     	if ((int)ring->tail < 0) {
-+     		DRM_ERROR("buggy X server: ring->tail = %u\n", ring->tail);
-+     		ring->tail = ring->head;
-+     	}
-      	ring->space = ring->head - (ring->tail+8);
-      	if (ring->space < 0) ring->space += ring->Size;
- }
+
 diff -urN kernel-source-2.4.26/drivers/ide/Config.in kernel-source-2.4.26-1/drivers/ide/Config.in
 --- kernel-source-2.4.26/drivers/ide/Config.in	2004-04-14 23:05:29.000000000 +1000
 +++ kernel-source-2.4.26-1/drivers/ide/Config.in	2004-04-17 14:23:47.000000000 +1000
@@ -6153,30 +6027,7 @@
  		vp->tx_ring[entry].frag[0].addr = cpu_to_le32(pci_map_single(vp->pdev, skb->data,
 
 
-diff -urN kernel-source-2.4.26/drivers/net/hamradio/soundmodem/sm.h kernel-source-2.4.26-1/drivers/net/hamradio/soundmodem/sm.h
---- kernel-source-2.4.26/drivers/net/hamradio/soundmodem/sm.h	2002-08-03 10:39:44.000000000 +1000
-+++ kernel-source-2.4.26-1/drivers/net/hamradio/soundmodem/sm.h	2002-03-06 19:49:48.000000000 +1100
-@@ -363,7 +363,7 @@
- 
- /* --------------------------------------------------------------------- */
- 
--extern void inline sm_int_freq(struct sm_state *sm)
-+static void inline sm_int_freq(struct sm_state *sm)
- {
- #ifdef SM_DEBUG
- 	unsigned long cur_jiffies = jiffies;
-diff -urN kernel-source-2.4.26/drivers/net/hamradio/soundmodem/sm_wss.c kernel-source-2.4.26-1/drivers/net/hamradio/soundmodem/sm_wss.c
---- kernel-source-2.4.26/drivers/net/hamradio/soundmodem/sm_wss.c	2002-11-29 10:53:13.000000000 +1100
-+++ kernel-source-2.4.26-1/drivers/net/hamradio/soundmodem/sm_wss.c	2002-11-30 15:49:40.000000000 +1100
-@@ -100,7 +100,7 @@
- 
- /* --------------------------------------------------------------------- */
- 
--extern void inline wss_ack_int(struct net_device *dev)
-+static void inline wss_ack_int(struct net_device *dev)
- {
- 	outb(0, WSS_CODEC_STATUS(dev->base_addr));
- }
+
 diff -urN kernel-source-2.4.26/drivers/net/ppp_generic.c kernel-source-2.4.26-1/drivers/net/ppp_generic.c
 --- kernel-source-2.4.26/drivers/net/ppp_generic.c	2003-08-25 21:44:42.000000000 +1000
 +++ kernel-source-2.4.26-1/drivers/net/ppp_generic.c	2004-04-17 10:10:28.000000000 +1000
@@ -6232,49 +6083,8 @@
  
  /*
 
-diff -urN kernel-source-2.4.26/drivers/net/tokenring/ibmtr.c kernel-source-2.4.26-1/drivers/net/tokenring/ibmtr.c
---- kernel-source-2.4.26/drivers/net/tokenring/ibmtr.c	2001-11-10 09:02:24.000000000 +1100
-+++ kernel-source-2.4.26-1/drivers/net/tokenring/ibmtr.c	2003-03-22 12:13:25.000000000 +1100
-@@ -330,7 +330,10 @@
- 	for (i = 0; ibmtr_portlist[i]; i++) {
- 		int ioaddr = ibmtr_portlist[i];
- 
-+		if (!request_region(ioaddr, IBMTR_IO_EXTENT, "ibmtr"))
-+			continue;
- 		if (!ibmtr_probe1(dev, ioaddr)) return 0;
-+		release_region(ioaddr, IBMTR_IO_EXTENT);
- 	}
- 	return -ENODEV;
- }
-@@ -669,15 +672,6 @@
- 		kfree(ti);
- 		return -ENODEV;
- 	}
--	/*?? Now, allocate some of the PIO PORTs for this driver.. */
--	/* record PIOaddr range as busy */
--	if (!request_region(PIOaddr, IBMTR_IO_EXTENT, "ibmtr")) {
--		DPRINTK("Could not grab PIO range. Halting driver.\n");
--		free_irq(dev->irq, dev);
--		iounmap(t_mmio);
--		kfree(ti);
--		return -EBUSY;
--	}
- 
- 	if (!version_printed++) {
- 		printk(version);
-diff -urN kernel-source-2.4.26/drivers/net/via-rhine.c kernel-source-2.4.26-1/drivers/net/via-rhine.c
---- kernel-source-2.4.26/drivers/net/via-rhine.c	2003-11-29 05:26:20.000000000 +1100
-+++ kernel-source-2.4.26-1/drivers/net/via-rhine.c	2003-11-29 20:53:36.000000000 +1100
-@@ -523,8 +523,8 @@
- 	u16 chip_cmd;						/* Current setting for ChipCmd */
- 
- 	/* These values are keep track of the transceiver/media in use. */
--	unsigned int default_port:4;		/* Last dev->if_port value. */
- 	u8 tx_thresh, rx_thresh;
-+	unsigned int default_port;		/* Last dev->if_port value. */
- 
- 	/* MII transceiver section. */
- 	unsigned char phys[MAX_MII_CNT];			/* MII device addresses. */
+
+
 diff -urN kernel-source-2.4.26/drivers/net/wan/farsync.c kernel-source-2.4.26-1/drivers/net/wan/farsync.c
 --- kernel-source-2.4.26/drivers/net/wan/farsync.c	2003-11-29 05:26:20.000000000 +1100
 +++ kernel-source-2.4.26-1/drivers/net/wan/farsync.c	2003-11-29 20:53:37.000000000 +1100
@@ -6286,18 +6096,6 @@
  #include <linux/if.h>
  #include <linux/hdlc.h>
  
-diff -urN kernel-source-2.4.26/Documentation/usb/sl811hc.txt kernel-source-2.4.26-1/Documentation/usb/sl811hc.txt
---- kernel-source-2.4.26/Documentation/usb/sl811hc.txt	2003-11-29 05:26:19.000000000 +1100
-+++ kernel-source-2.4.26-1/Documentation/usb/sl811hc.txt	2004-01-17 16:27:19.000000000 +1100
-@@ -133,7 +133,7 @@
- 
- Drivers are all under contructions. So some drivers make a kernel panic. In
- this case read all about the drivers dokumentaiona and the drivers source.
--Some drivers need a other kernel driver, but not strictly checked in kenel
-+Some drivers need a other kernel driver, but not strictly checked in kernel
- configuration. Here can help the ksymsoops.
- 
- 
 diff -urN kernel-source-2.4.26/drivers/scsi/advansys.c kernel-source-2.4.26-1/drivers/scsi/advansys.c
 --- kernel-source-2.4.26/drivers/scsi/advansys.c	2004-04-14 23:05:31.000000000 +1000
 +++ kernel-source-2.4.26-1/drivers/scsi/advansys.c	2004-04-17 14:23:54.000000000 +1000
@@ -6326,45 +6124,6 @@
  #EXTRA_CFLAGS += -g
  
  # Platform Specific Files
-diff -urN kernel-source-2.4.26/drivers/scsi/aic7xxx/aic7xxx_osm.c kernel-source-2.4.26-1/drivers/scsi/aic7xxx/aic7xxx_osm.c
---- kernel-source-2.4.26/drivers/scsi/aic7xxx/aic7xxx_osm.c	2003-11-29 05:26:20.000000000 +1100
-+++ kernel-source-2.4.26-1/drivers/scsi/aic7xxx/aic7xxx_osm.c	2004-02-18 18:52:27.000000000 +1100
-@@ -3990,11 +3990,10 @@
- }
- 
- static void
--ahc_linux_free_device(struct ahc_softc *ahc, struct ahc_linux_device *dev)
-+__ahc_linux_free_device(struct ahc_softc *ahc, struct ahc_linux_device *dev)
- {
- 	struct ahc_linux_target *targ;
- 
--	del_timer_sync(&dev->timer);
- 	targ = dev->target;
- 	targ->devices[dev->lun] = NULL;
- 	free(dev, M_DEVBUF);
-@@ -4004,6 +4003,13 @@
- 		ahc_linux_free_target(ahc, targ);
- }
- 
-+static void
-+ahc_linux_free_device(struct ahc_softc *ahc, struct ahc_linux_device *dev)
-+{
-+	del_timer_sync(&dev->timer);
-+	__ahc_linux_free_device(ahc, dev);
-+}
-+
- void
- ahc_send_async(struct ahc_softc *ahc, char channel,
- 	       u_int target, u_int lun, ac_code code, void *arg)
-@@ -4703,7 +4709,7 @@
- 		ahc_linux_run_device_queue(ahc, dev);
- 	if (TAILQ_EMPTY(&dev->busyq)
- 	 && dev->active == 0)
--		ahc_linux_free_device(ahc, dev);
-+		__ahc_linux_free_device(ahc, dev);
- 	ahc_unlock(ahc, &s);
- }
- 
 
 diff -urN kernel-source-2.4.26/drivers/usb/host/usb-ohci.c kernel-source-2.4.26-1/drivers/usb/host/usb-ohci.c
 --- kernel-source-2.4.26/drivers/usb/host/usb-ohci.c	2004-04-14 23:05:33.000000000 +1000