2.6.15-git3 refresh

10 files changed, 25 insertions, 25 deletions

diff --git a/pci/drivers-rest-replace-pci_module_init-with-pci_register_driver.patch b/pci/drivers-rest-replace-pci_module_init-with-pci_register_driver.patch
index 331c27619a3cc..07ae55e7884ed 100644
--- a/pci/drivers-rest-replace-pci_module_init-with-pci_register_driver.patch
+++ b/pci/drivers-rest-replace-pci_module_init-with-pci_register_driver.patch
@@ -55,7 +55,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void __exit parport_serial_exit (void)
 --- gregkh-2.6.orig/drivers/pcmcia/vrc4173_cardu.c
 +++ gregkh-2.6/drivers/pcmcia/vrc4173_cardu.c
-@@ -604,7 +604,7 @@ static int __devinit vrc4173_cardu_init(
+@@ -561,7 +561,7 @@ static int __devinit vrc4173_cardu_init(
  {
  	vrc4173_cardu_slots = 0;
  
diff --git a/pci/drivers-scsi-replace-pci_module_init-with-pci_register_driver.patch b/pci/drivers-scsi-replace-pci_module_init-with-pci_register_driver.patch
index 32ef2b89c0096..018b7ada154cd 100644
--- a/pci/drivers-scsi-replace-pci_module_init-with-pci_register_driver.patch
+++ b/pci/drivers-scsi-replace-pci_module_init-with-pci_register_driver.patch
@@ -85,7 +85,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void __exit inia100_exit(void)
 --- gregkh-2.6.orig/drivers/scsi/ahci.c
 +++ gregkh-2.6/drivers/scsi/ahci.c
-@@ -1144,7 +1144,7 @@ static void ahci_remove_one (struct pci_
+@@ -1143,7 +1143,7 @@ static void ahci_remove_one (struct pci_
  
  static int __init ahci_init(void)
  {
@@ -118,7 +118,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  void
 --- gregkh-2.6.orig/drivers/scsi/ata_piix.c
 +++ gregkh-2.6/drivers/scsi/ata_piix.c
-@@ -743,8 +743,8 @@ static int __init piix_init(void)
+@@ -746,8 +746,8 @@ static int __init piix_init(void)
  {
  	int rc;
  
@@ -296,7 +296,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static inline void
 --- gregkh-2.6.orig/drivers/scsi/sata_mv.c
 +++ gregkh-2.6/drivers/scsi/sata_mv.c
-@@ -2233,7 +2233,7 @@ err_out:
+@@ -2232,7 +2232,7 @@ err_out:
  
  static int __init mv_init(void)
  {
@@ -307,7 +307,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void __exit mv_exit(void)
 --- gregkh-2.6.orig/drivers/scsi/sata_nv.c
 +++ gregkh-2.6/drivers/scsi/sata_nv.c
-@@ -591,7 +591,7 @@ static void nv_check_hotplug_ck804(struc
+@@ -590,7 +590,7 @@ static void nv_check_hotplug_ck804(struc
  
  static int __init nv_init(void)
  {
@@ -318,7 +318,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void __exit nv_exit(void)
 --- gregkh-2.6.orig/drivers/scsi/sata_promise.c
 +++ gregkh-2.6/drivers/scsi/sata_promise.c
-@@ -745,7 +745,7 @@ err_out:
+@@ -744,7 +744,7 @@ err_out:
  
  static int __init pdc_ata_init(void)
  {
@@ -340,7 +340,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void __exit qs_ata_exit(void)
 --- gregkh-2.6.orig/drivers/scsi/sata_sil24.c
 +++ gregkh-2.6/drivers/scsi/sata_sil24.c
-@@ -1022,7 +1022,7 @@ static int sil24_init_one(struct pci_dev
+@@ -1021,7 +1021,7 @@ static int sil24_init_one(struct pci_dev
  
  static int __init sil24_init(void)
  {
@@ -351,7 +351,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void __exit sil24_exit(void)
 --- gregkh-2.6.orig/drivers/scsi/sata_sil.c
 +++ gregkh-2.6/drivers/scsi/sata_sil.c
-@@ -512,7 +512,7 @@ err_out:
+@@ -511,7 +511,7 @@ err_out:
  
  static int __init sil_init(void)
  {
@@ -362,7 +362,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void __exit sil_exit(void)
 --- gregkh-2.6.orig/drivers/scsi/sata_sis.c
 +++ gregkh-2.6/drivers/scsi/sata_sis.c
-@@ -335,7 +335,7 @@ err_out:
+@@ -334,7 +334,7 @@ err_out:
  
  static int __init sis_init(void)
  {
@@ -373,7 +373,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void __exit sis_exit(void)
 --- gregkh-2.6.orig/drivers/scsi/sata_svw.c
 +++ gregkh-2.6/drivers/scsi/sata_svw.c
-@@ -485,7 +485,7 @@ static struct pci_driver k2_sata_pci_dri
+@@ -484,7 +484,7 @@ static struct pci_driver k2_sata_pci_dri
  
  static int __init k2_sata_init(void)
  {
@@ -384,7 +384,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- gregkh-2.6.orig/drivers/scsi/sata_sx4.c
 +++ gregkh-2.6/drivers/scsi/sata_sx4.c
-@@ -1501,7 +1501,7 @@ err_out:
+@@ -1500,7 +1500,7 @@ err_out:
  
  static int __init pdc_sata_init(void)
  {
@@ -395,7 +395,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- gregkh-2.6.orig/drivers/scsi/sata_uli.c
 +++ gregkh-2.6/drivers/scsi/sata_uli.c
-@@ -272,7 +272,7 @@ err_out:
+@@ -271,7 +271,7 @@ err_out:
  
  static int __init uli_init(void)
  {
@@ -406,7 +406,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void __exit uli_exit(void)
 --- gregkh-2.6.orig/drivers/scsi/sata_via.c
 +++ gregkh-2.6/drivers/scsi/sata_via.c
-@@ -382,7 +382,7 @@ err_out:
+@@ -381,7 +381,7 @@ err_out:
  
  static int __init svia_init(void)
  {
@@ -417,7 +417,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void __exit svia_exit(void)
 --- gregkh-2.6.orig/drivers/scsi/sata_vsc.c
 +++ gregkh-2.6/drivers/scsi/sata_vsc.c
-@@ -417,7 +417,7 @@ static struct pci_driver vsc_sata_pci_dr
+@@ -416,7 +416,7 @@ static struct pci_driver vsc_sata_pci_dr
  
  static int __init vsc_sata_init(void)
  {
diff --git a/pci/drivers-sound-oss-replace-pci_module_init-with-pci_register_driver.patch b/pci/drivers-sound-oss-replace-pci_module_init-with-pci_register_driver.patch
index 9af2fed30f9a0..c4f901370c444 100644
--- a/pci/drivers-sound-oss-replace-pci_module_init-with-pci_register_driver.patch
+++ b/pci/drivers-sound-oss-replace-pci_module_init-with-pci_register_driver.patch
@@ -62,7 +62,7 @@ Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
  static void __exit cleanup_cmpci(void)
 --- gregkh-2.6.orig/sound/oss/cs4281/cs4281m.c
 +++ gregkh-2.6/sound/oss/cs4281/cs4281m.c
-@@ -4477,7 +4477,7 @@ static int __init cs4281_init_module(voi
+@@ -4461,7 +4461,7 @@ static int __init cs4281_init_module(voi
  	printk(KERN_INFO "cs4281: version v%d.%02d.%d time " __TIME__ " "
  	       __DATE__ "\n", CS4281_MAJOR_VERSION, CS4281_MINOR_VERSION,
  	       CS4281_ARCH);
@@ -73,7 +73,7 @@ Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
  		  printk(KERN_INFO "cs4281: cs4281_init_module()- (%d)\n",rtn));
 --- gregkh-2.6.orig/sound/oss/cs46xx.c
 +++ gregkh-2.6/sound/oss/cs46xx.c
-@@ -5711,7 +5711,7 @@ static int __init cs46xx_init_module(voi
+@@ -5690,7 +5690,7 @@ static int __init cs46xx_init_module(voi
  	int rtn = 0;
  	CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO 
  		"cs46xx: cs46xx_init_module()+ \n"));
@@ -139,7 +139,7 @@ Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
  static void __devexit kahlua_cleanup_module(void)
 --- gregkh-2.6.orig/sound/oss/maestro.c
 +++ gregkh-2.6/sound/oss/maestro.c
-@@ -3634,7 +3634,7 @@ static int __init init_maestro(void)
+@@ -3624,7 +3624,7 @@ static int __init init_maestro(void)
  {
  	int rc;
  
@@ -161,7 +161,7 @@ Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
  static void __exit cleanup_vrc5477_ac97(void)
 --- gregkh-2.6.orig/sound/oss/nm256_audio.c
 +++ gregkh-2.6/sound/oss/nm256_audio.c
-@@ -1690,7 +1690,7 @@ module_param(force_load, bool, 0);
+@@ -1644,7 +1644,7 @@ module_param(force_load, bool, 0);
  static int __init do_init_nm256(void)
  {
      printk (KERN_INFO "NeoMagic 256AV/256ZX audio driver, version 1.1p\n");
diff --git a/pci/pci-error-recovery-documentation.patch b/pci/pci-error-recovery-documentation.patch
index 43449d7e10222..dcef613dbda14 100644
--- a/pci/pci-error-recovery-documentation.patch
+++ b/pci/pci-error-recovery-documentation.patch
@@ -272,7 +272,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +Revised: 31 May 2005 Linas Vepstas <linas@austin.ibm.com>
 --- gregkh-2.6.orig/MAINTAINERS
 +++ gregkh-2.6/MAINTAINERS
-@@ -1982,6 +1982,13 @@ M:	hch@infradead.org
+@@ -1996,6 +1996,13 @@ M:	hch@infradead.org
  L:	linux-abi-devel@lists.sourceforge.net
  S:	Maintained
  
diff --git a/pci/pci-irq.c-trivial-printk-and-dbg-updates.patch b/pci/pci-irq.c-trivial-printk-and-dbg-updates.patch
index b8a71556947e1..1bd1306c36c7e 100644
--- a/pci/pci-irq.c-trivial-printk-and-dbg-updates.patch
+++ b/pci/pci-irq.c-trivial-printk-and-dbg-updates.patch
@@ -113,7 +113,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	DBG(" -> PIRQ %02x, mask %04x, excl %04x", pirq, mask, pirq_table->exclusive_irqs);
 @@ -848,7 +849,10 @@ static int pcibios_lookup_irq(struct pci
  	newirq = dev->irq;
- 	if (!((1 << newirq) & mask)) {
+ 	if (newirq && !((1 << newirq) & mask)) {
  		if ( pci_probe & PCI_USE_PIRQ_MASK) newirq = 0;
 -		else printk(KERN_WARNING "PCI: IRQ %i for device %s doesn't match PIRQ mask - try pci=usepirqmask\n", newirq, pci_name(dev));
 +		else printk("\n" KERN_WARNING
diff --git a/pci/pci-schedule-removal-of-pci_module_init.patch b/pci/pci-schedule-removal-of-pci_module_init.patch
index a9a410ecff7aa..032d47f41c0fa 100644
--- a/pci/pci-schedule-removal-of-pci_module_init.patch
+++ b/pci/pci-schedule-removal-of-pci_module_init.patch
@@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/Documentation/feature-removal-schedule.txt
 +++ gregkh-2.6/Documentation/feature-removal-schedule.txt
-@@ -150,3 +150,10 @@ Why:	The 8250 serial driver now has the 
+@@ -139,3 +139,10 @@ Why:	The 8250 serial driver now has the 
  	brother on Alchemy SOCs.  The loss of features is not considered an
  	issue.
  Who:	Ralf Baechle <ralf@linux-mips.org>
diff --git a/pci/reduce-nr-of-ptr-derefs-in-drivers-pci-hotplug-cpqphp_core.c.patch b/pci/reduce-nr-of-ptr-derefs-in-drivers-pci-hotplug-cpqphp_core.c.patch
index 92fb684903e86..92b7a90b398ef 100644
--- a/pci/reduce-nr-of-ptr-derefs-in-drivers-pci-hotplug-cpqphp_core.c.patch
+++ b/pci/reduce-nr-of-ptr-derefs-in-drivers-pci-hotplug-cpqphp_core.c.patch
@@ -1,6 +1,6 @@
 From jesper.juhl@gmail.com Sat Dec 10 21:43:02 2005
 From: Jesper Juhl <jesper.juhl@gmail.com>
-Subject: [PATCH] Reduce nr of ptr derefs in drivers/pci/hotplug/cpqphp_core.c
+Subject: PCI: Reduce nr of ptr derefs in drivers/pci/hotplug/cpqphp_core.c
 Date: Sun, 11 Dec 2005 06:42:18 +0100
 Cc: Torben Mathiasen <torben.mathiasen@hp.com>, greg@kroah.com, Andrew Morton <akpm@osdl.org>, Jesper Juhl <jesper.juhl@gmail.com>
 Content-Disposition: inline
diff --git a/pci/reduce-nr-of-ptr-derefs-in-drivers-pci-hotplug-pciehp_core.c.patch b/pci/reduce-nr-of-ptr-derefs-in-drivers-pci-hotplug-pciehp_core.c.patch
index 38064bd20e3e1..85eb5c67e5bd6 100644
--- a/pci/reduce-nr-of-ptr-derefs-in-drivers-pci-hotplug-pciehp_core.c.patch
+++ b/pci/reduce-nr-of-ptr-derefs-in-drivers-pci-hotplug-pciehp_core.c.patch
@@ -1,6 +1,6 @@
 From jesper.juhl@gmail.com Sat Dec 10 21:48:55 2005
 From: Jesper Juhl <jesper.juhl@gmail.com>
-Subject: [PATCH] Reduce nr of ptr derefs in drivers/pci/hotplug/pciehp_core.c
+Subject: PCI: Reduce nr of ptr derefs in drivers/pci/hotplug/pciehp_core.c
 Date: Sun, 11 Dec 2005 06:41:42 +0100
 Cc: greg@kroah.com, <kristen.c.accardi@intel.com>, Andrew Morton <akpm@osdl.org>, Jesper Juhl <jesper.juhl@gmail.com>
 Content-Disposition: inline
diff --git a/pci/reduce-nr-of-ptr-derefs-in-drivers-pci-hotplug-pciehprm_acpi.c.patch b/pci/reduce-nr-of-ptr-derefs-in-drivers-pci-hotplug-pciehprm_acpi.c.patch
index d6e08e4603796..80c8ba3fdb68d 100644
--- a/pci/reduce-nr-of-ptr-derefs-in-drivers-pci-hotplug-pciehprm_acpi.c.patch
+++ b/pci/reduce-nr-of-ptr-derefs-in-drivers-pci-hotplug-pciehprm_acpi.c.patch
@@ -1,6 +1,6 @@
 From jesper.juhl@gmail.com Sat Dec 10 21:43:24 2005
 From: Jesper Juhl <jesper.juhl@gmail.com>
-Subject: [PATCH] Reduce nr of ptr derefs in drivers/pci/hotplug/pciehprm_acpi.c
+Subject: PCI: Reduce nr of ptr derefs in drivers/pci/hotplug/pciehprm_acpi.c
 Date: Sun, 11 Dec 2005 06:43:09 +0100
 Cc: <kristen.c.accardi@intel.com>, Andrew Morton <akpm@osdl.org>, Jesper Juhl <jesper.juhl@gmail.com>, greg@kroah.com
 Content-Disposition: inline
diff --git a/pci/reduce-nr-of-ptr-derefs-in-drivers-pci-hotplug-rpaphp_pci.c.patch b/pci/reduce-nr-of-ptr-derefs-in-drivers-pci-hotplug-rpaphp_pci.c.patch
index 3b232494cf04b..aa77cd2136c61 100644
--- a/pci/reduce-nr-of-ptr-derefs-in-drivers-pci-hotplug-rpaphp_pci.c.patch
+++ b/pci/reduce-nr-of-ptr-derefs-in-drivers-pci-hotplug-rpaphp_pci.c.patch
@@ -1,6 +1,6 @@
 From jesper.juhl@gmail.com Sat Dec 10 21:43:18 2005
 From: Jesper Juhl <jesper.juhl@gmail.com>
-Subject: [PATCH] Reduce nr of ptr derefs in drivers/pci/hotplug/rpaphp_pci.c
+Subject: PCI: Reduce nr of ptr derefs in drivers/pci/hotplug/rpaphp_pci.c
 Date: Sun, 11 Dec 2005 06:42:38 +0100
 Cc: <lxie@us.ibm.com>, Andrew Morton <akpm@osdl.org>, Jesper Juhl <jesper.juhl@gmail.com>, greg@kroah.com
 Content-Disposition: inline