refresh for 2.6.15-git1

8 files changed, 42 insertions, 42 deletions

diff --git a/pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch b/pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch
index 02d9bbc22be9f..ed3db950a1678 100644
--- a/pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch
+++ b/pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch
@@ -107,7 +107,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void __exit cp_exit (void)
 --- gregkh-2.6.orig/drivers/net/8139too.c
 +++ gregkh-2.6/drivers/net/8139too.c
-@@ -2635,7 +2635,7 @@ static int __init rtl8139_init_module (v
+@@ -2613,7 +2613,7 @@ static int __init rtl8139_init_module (v
  	printk (KERN_INFO RTL8139_DRIVER_NAME "\n");
  #endif
  
@@ -349,7 +349,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- gregkh-2.6.orig/drivers/net/ns83820.c
 +++ gregkh-2.6/drivers/net/ns83820.c
-@@ -2175,7 +2175,7 @@ static struct pci_driver driver = {
+@@ -2176,7 +2176,7 @@ static struct pci_driver driver = {
  static int __init ns83820_init(void)
  {
  	printk(KERN_INFO "ns83820.c: National Semiconductor DP83820 10/100/1000 driver.\n");
@@ -404,7 +404,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void __exit rr_cleanup_module(void)
 --- gregkh-2.6.orig/drivers/net/s2io.c
 +++ gregkh-2.6/drivers/net/s2io.c
-@@ -6297,7 +6297,7 @@ static void __devexit s2io_rem_nic(struc
+@@ -6335,7 +6335,7 @@ static void __devexit s2io_rem_nic(struc
  
  int __init s2io_starter(void)
  {
@@ -437,7 +437,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void __exit sis190_cleanup_module(void)
 --- gregkh-2.6.orig/drivers/net/sis900.c
 +++ gregkh-2.6/drivers/net/sis900.c
-@@ -2410,7 +2410,7 @@ static int __init sis900_init_module(voi
+@@ -2479,7 +2479,7 @@ static int __init sis900_init_module(voi
  	printk(version);
  #endif
  
@@ -459,7 +459,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void __exit skfd_exit(void)
 --- gregkh-2.6.orig/drivers/net/skge.c
 +++ gregkh-2.6/drivers/net/skge.c
-@@ -3419,7 +3419,7 @@ static struct pci_driver skge_driver = {
+@@ -3438,7 +3438,7 @@ static struct pci_driver skge_driver = {
  
  static int __init skge_init_module(void)
  {
@@ -514,7 +514,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void __exit tc35815_cleanup_module(void)
 --- gregkh-2.6.orig/drivers/net/tg3.c
 +++ gregkh-2.6/drivers/net/tg3.c
-@@ -10951,7 +10951,7 @@ static struct pci_driver tg3_driver = {
+@@ -10952,7 +10952,7 @@ static struct pci_driver tg3_driver = {
  
  static int __init tg3_init(void)
  {
@@ -752,11 +752,11 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 -	ret = pci_module_init(&ipw2100_pci_driver);
 +	ret = pci_register_driver(&ipw2100_pci_driver);
  
- #ifdef CONFIG_IPW_DEBUG
+ #ifdef CONFIG_IPW2100_DEBUG
  	ipw2100_debug_level = debug;
 --- gregkh-2.6.orig/drivers/net/wireless/ipw2200.c
 +++ gregkh-2.6/drivers/net/wireless/ipw2200.c
-@@ -11221,7 +11221,7 @@ static int __init ipw_init(void)
+@@ -11215,7 +11215,7 @@ static int __init ipw_init(void)
  	printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION ", " DRV_VERSION "\n");
  	printk(KERN_INFO DRV_NAME ": " DRV_COPYRIGHT "\n");
  
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 a14399fe9b987..32ef2b89c0096 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
-@@ -1140,7 +1140,7 @@ static void ahci_remove_one (struct pci_
+@@ -1144,7 +1144,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
-@@ -684,8 +684,8 @@ static int __init piix_init(void)
+@@ -743,8 +743,8 @@ static int __init piix_init(void)
  {
  	int rc;
  
@@ -153,7 +153,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void __exit dmx3191d_exit(void)
 --- gregkh-2.6.orig/drivers/scsi/ipr.c
 +++ gregkh-2.6/drivers/scsi/ipr.c
-@@ -6736,7 +6736,7 @@ static int __init ipr_init(void)
+@@ -6751,7 +6751,7 @@ static int __init ipr_init(void)
  	ipr_info("IBM Power RAID SCSI Device Driver version: %s %s\n",
  		 IPR_DRIVER_VERSION, IPR_DRIVER_DATE);
  
@@ -186,7 +186,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		printk(KERN_DEBUG "megasas: PCI hotplug regisration failed \n");
 --- gregkh-2.6.orig/drivers/scsi/megaraid.c
 +++ gregkh-2.6/drivers/scsi/megaraid.c
-@@ -5081,7 +5081,7 @@ static int __init megaraid_init(void)
+@@ -5072,7 +5072,7 @@ static int __init megaraid_init(void)
  				"megaraid: failed to create megaraid root\n");
  	}
  #endif
@@ -208,7 +208,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void __exit exit_nsp32(void) {
 --- gregkh-2.6.orig/drivers/scsi/pdc_adma.c
 +++ gregkh-2.6/drivers/scsi/pdc_adma.c
-@@ -722,7 +722,7 @@ err_out:
+@@ -721,7 +721,7 @@ err_out:
  
  static int __init adma_ata_init(void)
  {
@@ -285,18 +285,18 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void __exit
 --- gregkh-2.6.orig/drivers/scsi/qla2xxx/qla_os.c
 +++ gregkh-2.6/drivers/scsi/qla2xxx/qla_os.c
-@@ -2565,7 +2565,7 @@ qla2x00_module_init(void)
- 		return -ENODEV;
+@@ -2622,7 +2622,7 @@ static struct pci_driver qla2xxx_pci_dri
+ static inline int
+ qla2x00_pci_module_init(void)
+ {
+-	return pci_module_init(&qla2xxx_pci_driver);
++	return pci_register_driver(&qla2xxx_pci_driver);
+ }
  
- 	printk(KERN_INFO "QLogic Fibre Channel HBA Driver\n");
--	ret = pci_module_init(&qla2xxx_pci_driver);
-+	ret = pci_register_driver(&qla2xxx_pci_driver);
- 	if (ret) {
- 		kmem_cache_destroy(srb_cachep);
- 		fc_release_transport(qla2xxx_transport_template);
+ static inline void
 --- gregkh-2.6.orig/drivers/scsi/sata_mv.c
 +++ gregkh-2.6/drivers/scsi/sata_mv.c
-@@ -2230,7 +2230,7 @@ err_out:
+@@ -2233,7 +2233,7 @@ err_out:
  
  static int __init mv_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
-@@ -743,7 +743,7 @@ err_out:
+@@ -745,7 +745,7 @@ err_out:
  
  static int __init pdc_ata_init(void)
  {
@@ -329,7 +329,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- gregkh-2.6.orig/drivers/scsi/sata_qstor.c
 +++ gregkh-2.6/drivers/scsi/sata_qstor.c
-@@ -712,7 +712,7 @@ err_out:
+@@ -713,7 +713,7 @@ err_out:
  
  static int __init qs_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
-@@ -1017,7 +1017,7 @@ static int sil24_init_one(struct pci_dev
+@@ -1022,7 +1022,7 @@ static int sil24_init_one(struct pci_dev
  
  static int __init sil24_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
-@@ -1496,7 +1496,7 @@ err_out:
+@@ -1501,7 +1501,7 @@ err_out:
  
  static int __init pdc_sata_init(void)
  {
diff --git a/pci/pci-error-recovery-documentation.patch b/pci/pci-error-recovery-documentation.patch
index ac74e9f940f43..43449d7e10222 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
-@@ -1978,6 +1978,13 @@ M:	hch@infradead.org
+@@ -1982,6 +1982,13 @@ M:	hch@infradead.org
  L:	linux-abi-devel@lists.sourceforge.net
  S:	Maintained
  
diff --git a/pci/pci-error-recovery-e1000-network-device-driver.patch b/pci/pci-error-recovery-e1000-network-device-driver.patch
index 3332e5c1509ba..950b10146acbf 100644
--- a/pci/pci-error-recovery-e1000-network-device-driver.patch
+++ b/pci/pci-error-recovery-e1000-network-device-driver.patch
@@ -48,7 +48,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  };
  
  MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
-@@ -2926,6 +2937,10 @@ e1000_update_stats(struct e1000_adapter 
+@@ -2941,6 +2952,10 @@ e1000_update_stats(struct e1000_adapter 
  
  #define PHY_IDLE_ERROR_COUNT_MASK 0x00FF
  
@@ -59,7 +59,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	spin_lock_irqsave(&adapter->stats_lock, flags);
  
  	/* these counters are modified from e1000_adjust_tbi_stats,
-@@ -4347,4 +4362,88 @@ e1000_netpoll(struct net_device *netdev)
+@@ -4331,4 +4346,88 @@ e1000_netpoll(struct net_device *netdev)
  }
  #endif
  
diff --git a/pci/pci-error-recovery-ipr-scsi-device-driver.patch b/pci/pci-error-recovery-ipr-scsi-device-driver.patch
index 9d8195d71f862..6c78e493d0d85 100644
--- a/pci/pci-error-recovery-ipr-scsi-device-driver.patch
+++ b/pci/pci-error-recovery-ipr-scsi-device-driver.patch
@@ -114,7 +114,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /**
   * ipr_probe_ioa_part2 - Initializes IOAs found in ipr_probe_ioa(..)
   * @ioa_cfg:	ioa cfg struct
-@@ -6625,12 +6711,18 @@ static struct pci_device_id ipr_pci_tabl
+@@ -6640,12 +6726,18 @@ static struct pci_device_id ipr_pci_tabl
  };
  MODULE_DEVICE_TABLE(pci, ipr_pci_table);
  
diff --git a/pci/pci-error-recovery-symbios-scsi-device-driver.patch b/pci/pci-error-recovery-symbios-scsi-device-driver.patch
index cc6fd5ebeb3ff..2b4217ebb3e47 100644
--- a/pci/pci-error-recovery-symbios-scsi-device-driver.patch
+++ b/pci/pci-error-recovery-symbios-scsi-device-driver.patch
@@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/scsi/sym53c8xx_2/sym_glue.c
 +++ gregkh-2.6/drivers/scsi/sym53c8xx_2/sym_glue.c
-@@ -686,6 +686,10 @@ static irqreturn_t sym53c8xx_intr(int ir
+@@ -716,6 +716,10 @@ static irqreturn_t sym53c8xx_intr(int ir
  
  	if (DEBUG_FLAGS & DEBUG_TINY) printf_debug ("[");
  
@@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	spin_lock_irqsave(np->s.host->host_lock, flags);
  	sym_interrupt(np);
  	spin_unlock_irqrestore(np->s.host->host_lock, flags);
-@@ -759,6 +763,25 @@ static void sym_eh_done(struct scsi_cmnd
+@@ -789,6 +793,25 @@ static void sym_eh_done(struct scsi_cmnd
   */
  static void sym_eh_timeout(u_long p) { __sym_eh_done((struct scsi_cmnd *)p, 1); }
  
@@ -58,7 +58,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /*
   *  Generic method for our eh processing.
   *  The 'op' argument tells what we have to do.
-@@ -799,6 +822,35 @@ prepare:
+@@ -829,6 +852,35 @@ prepare:
  
  	/* Try to proceed the operation we have been asked for */
  	sts = -1;
@@ -94,7 +94,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	switch(op) {
  	case SYM_EH_ABORT:
  		sts = sym_abort_scsiio(np, cmd, 1);
-@@ -1584,6 +1636,8 @@ static struct Scsi_Host * __devinit sym_
+@@ -1630,6 +1682,8 @@ static struct Scsi_Host * __devinit sym_
  	np->maxoffs	= dev->chip.offset_max;
  	np->maxburst	= dev->chip.burst_max;
  	np->myaddr	= dev->host_id;
@@ -103,7 +103,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	/*
  	 *  Edit its name.
-@@ -1916,6 +1970,58 @@ static int sym_detach(struct sym_hcb *np
+@@ -1962,6 +2016,58 @@ static int sym_detach(struct sym_hcb *np
  	return 1;
  }
  
@@ -162,7 +162,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /*
   * Driver host template.
   */
-@@ -2172,11 +2278,18 @@ static struct pci_device_id sym2_id_tabl
+@@ -2219,11 +2325,18 @@ static struct pci_device_id sym2_id_tabl
  
  MODULE_DEVICE_TABLE(pci, sym2_id_table);
  
@@ -183,7 +183,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static int __init sym2_init(void)
 --- gregkh-2.6.orig/drivers/scsi/sym53c8xx_2/sym_glue.h
 +++ gregkh-2.6/drivers/scsi/sym53c8xx_2/sym_glue.h
-@@ -181,6 +181,10 @@ struct sym_shcb {
+@@ -180,6 +180,10 @@ struct sym_shcb {
  	char		chip_name[8];
  	struct pci_dev	*device;
  
@@ -196,7 +196,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	void __iomem *	ioaddr;		/* MMIO kernel io address	*/
 --- gregkh-2.6.orig/drivers/scsi/sym53c8xx_2/sym_hipd.c
 +++ gregkh-2.6/drivers/scsi/sym53c8xx_2/sym_hipd.c
-@@ -2810,6 +2810,7 @@ void sym_interrupt (struct sym_hcb *np)
+@@ -2761,6 +2761,7 @@ void sym_interrupt (struct sym_hcb *np)
  	u_char	istat, istatc;
  	u_char	dstat;
  	u_short	sist;
@@ -204,7 +204,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	/*
  	 *  interrupt on the fly ?
-@@ -2851,6 +2852,7 @@ void sym_interrupt (struct sym_hcb *np)
+@@ -2802,6 +2803,7 @@ void sym_interrupt (struct sym_hcb *np)
  	sist	= 0;
  	dstat	= 0;
  	istatc	= istat;
@@ -212,7 +212,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	do {
  		if (istatc & SIP)
  			sist  |= INW(np, nc_sist);
-@@ -2858,6 +2860,19 @@ void sym_interrupt (struct sym_hcb *np)
+@@ -2809,6 +2811,19 @@ void sym_interrupt (struct sym_hcb *np)
  			dstat |= INB(np, nc_dstat);
  		istatc = INB(np, nc_istat);
  		istat |= istatc;
diff --git a/pci/pci-quirk-1k-i-o-space-granularity-on-intel-p64h2.patch b/pci/pci-quirk-1k-i-o-space-granularity-on-intel-p64h2.patch
index 7e6ef7d528d0b..a81d2a9495dfe 100644
--- a/pci/pci-quirk-1k-i-o-space-granularity-on-intel-p64h2.patch
+++ b/pci/pci-quirk-1k-i-o-space-granularity-on-intel-p64h2.patch
@@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	res = child->resource[1];
 --- gregkh-2.6.orig/drivers/pci/quirks.c
 +++ gregkh-2.6/drivers/pci/quirks.c
-@@ -1312,6 +1312,32 @@ void pci_fixup_device(enum pci_fixup_pas
+@@ -1342,6 +1342,32 @@ void pci_fixup_device(enum pci_fixup_pas
  	pci_do_fixups(dev, start, end);
  }
  
diff --git a/pci/shot-accross-the-bow.patch b/pci/shot-accross-the-bow.patch
index 1c509d3f0ab07..a8a11339e0796 100644
--- a/pci/shot-accross-the-bow.patch
+++ b/pci/shot-accross-the-bow.patch
@@ -255,7 +255,7 @@ Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
  
 --- gregkh-2.6.orig/drivers/pci/quirks.c
 +++ gregkh-2.6/drivers/pci/quirks.c
-@@ -1338,7 +1338,7 @@ static void __devinit quirk_p64h2_1k_io(
+@@ -1368,7 +1368,7 @@ static void __devinit quirk_p64h2_1k_io(
  }
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	0x1460,		quirk_p64h2_1k_io);