r4572 - in dists/trunk/linux-2.6/debian/patches-debian: . series

[Dann Frazier]

Author: dannf
Date: 2005-10-20 23:33:20 +0000 (Thu, 20 Oct 2005)
New Revision: 4572

Modified:
   dists/trunk/linux-2.6/debian/patches-debian/TODO
   dists/trunk/linux-2.6/debian/patches-debian/ia64-irq-affinity-upfix.patch
   dists/trunk/linux-2.6/debian/patches-debian/series/2.6.13+2.6.14-rc4-0experimental.1
Log:
fix offset changes in ia64-irq-affinity-upfix.patch

Modified: dists/trunk/linux-2.6/debian/patches-debian/TODO
===================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/TODO	2005-10-20 21:09:58 UTC (rev 4571)
+++ dists/trunk/linux-2.6/debian/patches-debian/TODO	2005-10-20 23:33:20 UTC (rev 4572)
@@ -3,10 +3,6 @@
 drivers-scsi-megaraid_splitup.patch
   FAILS:   1 hunk (drivers/scsi/megaraid/Kconfig.megaraid)
 
-ia64-irq-affinity-upfix.patch
-  FAILS    1 hunk (arch/ia64/kernel/irq.c)
-
-
 remove-references-to-removed-drivers.patch
   FAILS    1 hunk (drivers/usb/misc/Makefile)
 
@@ -55,7 +51,7 @@
   APPLIES  Offset
 
 ia64-irq-affinity-upfix.patch
-  FAILS    1 hunk (arch/ia64/kernel/irq.c)
+  APPLIES  Offset
 
 m68k-42_dma.patch
   APPLIES  Offset

Modified: dists/trunk/linux-2.6/debian/patches-debian/ia64-irq-affinity-upfix.patch
===================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/ia64-irq-affinity-upfix.patch	2005-10-20 21:09:58 UTC (rev 4571)
+++ dists/trunk/linux-2.6/debian/patches-debian/ia64-irq-affinity-upfix.patch	2005-10-20 23:33:20 UTC (rev 4572)
@@ -2,14 +2,13 @@
 ## DP: Patch author: dann frazier <dannf at hp.com>
 ## DP: Upstream status: Submitted
 #
-diff -aurN a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c
---- a/arch/ia64/kernel/irq.c	2005-06-06 11:22:29.000000000 -0400
-+++ b/arch/ia64/kernel/irq.c	2005-06-15 22:13:24.000000000 -0400
-@@ -141,7 +141,10 @@
+--- linux-2.6-2.6.13/arch/ia64/kernel/irq.c~	2005-10-20 17:28:56.000000000 -0600
++++ linux-2.6-2.6.13/arch/ia64/kernel/irq.c	2005-10-20 17:29:41.000000000 -0600
+@@ -105,6 +105,11 @@
+ 		irq_redir[irq] = (char) (redir & 0xff);
  	}
  }
- 
--
++
 +#else /* !CONFIG_SMP */
 +void set_irq_affinity_info (unsigned int irq, int hwid, int redir)
 +{

Modified: dists/trunk/linux-2.6/debian/patches-debian/series/2.6.13+2.6.14-rc4-0experimental.1
===================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/series/2.6.13+2.6.14-rc4-0experimental.1	2005-10-20 21:09:58 UTC (rev 4571)
+++ dists/trunk/linux-2.6/debian/patches-debian/series/2.6.13+2.6.14-rc4-0experimental.1	2005-10-20 23:33:20 UTC (rev 4572)
@@ -2,7 +2,7 @@
 #+ drivers-scsi-megaraid_splitup.patch
 + fbdev-radeon-noaccel.patch
 + fs-asfs-2.patch
-#+ ia64-irq-affinity-upfix.patch
++ ia64-irq-affinity-upfix.patch
 #- m68k-42_dma.patch
 #- m68k-sonic.patch
 #+ m68k-arch.patch