2.6.15-git12 resync

6 files changed, 14 insertions, 14 deletions

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 0f2423204cac9..4615c5c0873c2 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
@@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/scsi/3w-9xxx.c
 +++ gregkh-2.6/drivers/scsi/3w-9xxx.c
-@@ -2206,7 +2206,7 @@ static int __init twa_init(void)
+@@ -2207,7 +2207,7 @@ static int __init twa_init(void)
  {
  	printk(KERN_WARNING "3ware 9000 Storage Controller device driver for Linux v%s.\n", TW_DRIVER_VERSION);
  
@@ -63,7 +63,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /* This function is called on driver exit */
 --- gregkh-2.6.orig/drivers/scsi/3w-xxxx.c
 +++ gregkh-2.6/drivers/scsi/3w-xxxx.c
-@@ -2482,7 +2482,7 @@ static int __init tw_init(void)
+@@ -2483,7 +2483,7 @@ static int __init tw_init(void)
  {
  	printk(KERN_WARNING "3ware Storage Controller device driver for Linux v%s.\n", TW_DRIVER_VERSION);
  
@@ -164,7 +164,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /**
 --- gregkh-2.6.orig/drivers/scsi/ips.c
 +++ gregkh-2.6/drivers/scsi/ips.c
-@@ -7073,7 +7073,7 @@ ips_remove_device(struct pci_dev *pci_de
+@@ -7076,7 +7076,7 @@ ips_remove_device(struct pci_dev *pci_de
  static int __init
  ips_module_init(void)
  {
@@ -175,7 +175,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	ips_order_controllers();
 --- gregkh-2.6.orig/drivers/scsi/megaraid/megaraid_sas.c
 +++ gregkh-2.6/drivers/scsi/megaraid/megaraid_sas.c
-@@ -2768,7 +2768,7 @@ static int __init megasas_init(void)
+@@ -2769,7 +2769,7 @@ static int __init megasas_init(void)
  	/*
  	 * Register ourselves as PCI hotplug module
  	 */
@@ -285,7 +285,7 @@ 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
-@@ -2622,7 +2622,7 @@ static struct pci_driver qla2xxx_pci_dri
+@@ -2628,7 +2628,7 @@ static struct pci_driver qla2xxx_pci_dri
  static inline int
  qla2x00_pci_module_init(void)
  {
diff --git a/pci/pci-altix-msi-support.patch b/pci/pci-altix-msi-support.patch
index b3f79d2d5ca2b..9431c170e6c0d 100644
--- a/pci/pci-altix-msi-support.patch
+++ b/pci/pci-altix-msi-support.patch
@@ -585,7 +585,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	xio_base = pcibus_info->pbi_dir_xbase;
  	offset = xio_addr - xio_base;
-@@ -331,7 +356,7 @@ void sn_dma_flush(uint64_t addr)
+@@ -333,7 +358,7 @@ void sn_dma_flush(uint64_t addr)
   */
  
  dma_addr_t
@@ -594,7 +594,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  {
  	dma_addr_t dma_handle;
  	struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(hwdev);
-@@ -348,11 +373,11 @@ pcibr_dma_map(struct pci_dev * hwdev, un
+@@ -350,11 +375,11 @@ pcibr_dma_map(struct pci_dev * hwdev, un
  		 */
  
  		dma_handle = pcibr_dmatrans_direct64(pcidev_info, phys_addr,
@@ -608,7 +608,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		if (!dma_handle) {
  			/*
  			 * It is a 32 bit card and we cannot do direct mapping,
-@@ -360,7 +385,8 @@ pcibr_dma_map(struct pci_dev * hwdev, un
+@@ -362,7 +387,8 @@ pcibr_dma_map(struct pci_dev * hwdev, un
  			 */
  
  			dma_handle = pcibr_dmamap_ate32(pcidev_info, phys_addr,
@@ -618,7 +618,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		}
  	}
  
-@@ -369,18 +395,18 @@ pcibr_dma_map(struct pci_dev * hwdev, un
+@@ -371,18 +397,18 @@ pcibr_dma_map(struct pci_dev * hwdev, un
  
  dma_addr_t
  pcibr_dma_map_consistent(struct pci_dev * hwdev, unsigned long phys_addr,
diff --git a/pci/pci-irq-and-pci_ids-patch-for-intel-ich8.patch b/pci/pci-irq-and-pci_ids-patch-for-intel-ich8.patch
index 55309ed340acb..ed4de8349edd2 100644
--- a/pci/pci-irq-and-pci_ids-patch-for-intel-ich8.patch
+++ b/pci/pci-irq-and-pci_ids-patch-for-intel-ich8.patch
@@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			r->set = pirq_piix_set;
 --- gregkh-2.6.orig/include/linux/pci_ids.h
 +++ gregkh-2.6/include/linux/pci_ids.h
-@@ -2102,6 +2102,13 @@
+@@ -2103,6 +2103,13 @@
  #define PCI_DEVICE_ID_INTEL_ICH7_19	0x27dd
  #define PCI_DEVICE_ID_INTEL_ICH7_20	0x27de
  #define PCI_DEVICE_ID_INTEL_ICH7_21	0x27df
diff --git a/pci/pci-restore-2-missing-pci-ids.patch b/pci/pci-restore-2-missing-pci-ids.patch
index fa0e821f842f2..00658c81a67d8 100644
--- a/pci/pci-restore-2-missing-pci-ids.patch
+++ b/pci/pci-restore-2-missing-pci-ids.patch
@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/include/linux/pci_ids.h
 +++ gregkh-2.6/include/linux/pci_ids.h
-@@ -2063,6 +2063,7 @@
+@@ -2064,6 +2064,7 @@
  #define PCI_DEVICE_ID_INTEL_82801EB_5	0x24d5
  #define PCI_DEVICE_ID_INTEL_82801EB_6	0x24d6
  #define PCI_DEVICE_ID_INTEL_82801EB_11	0x24db
@@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #define PCI_DEVICE_ID_INTEL_ESB_1	0x25a1
  #define PCI_DEVICE_ID_INTEL_ESB_2	0x25a2
  #define PCI_DEVICE_ID_INTEL_ESB_4	0x25a4
-@@ -2152,6 +2153,7 @@
+@@ -2153,6 +2154,7 @@
  #define PCI_DEVICE_ID_INTEL_82443GX_2	0x71a2
  #define PCI_DEVICE_ID_INTEL_82372FB_1	0x7601
  #define PCI_DEVICE_ID_INTEL_82454GX	0x84c4
diff --git a/pci/pci-schedule-pci_legacy_proc-for-removal.patch b/pci/pci-schedule-pci_legacy_proc-for-removal.patch
index 0ee984f5957f6..dda2528666b05 100644
--- a/pci/pci-schedule-pci_legacy_proc-for-removal.patch
+++ b/pci/pci-schedule-pci_legacy_proc-for-removal.patch
@@ -18,7 +18,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
-@@ -139,3 +139,10 @@ Why:	The 8250 serial driver now has the 
+@@ -148,3 +148,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/pci-schedule-removal-of-pci_module_init.patch b/pci/pci-schedule-removal-of-pci_module_init.patch
index c356aeb19f460..a3aa96ea4bac8 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
-@@ -146,3 +146,10 @@ What:	Legacy /proc/pci interface (PCI_LE
+@@ -155,3 +155,10 @@ What:	Legacy /proc/pci interface (PCI_LE
  When:	March 2006
  Why:	deprecated since 2.5.53 in favor of lspci(8)
  Who:	Adrian Bunk <bunk@stusta.de>