refresh

3 files changed, 8 insertions, 21 deletions

diff --git a/pci/64bit-resource-change-pci-core-and-arch-code-to-use-resource_size_t.patch b/pci/64bit-resource-change-pci-core-and-arch-code-to-use-resource_size_t.patch
index 748f698662e15..171482bb46369 100644
--- a/pci/64bit-resource-change-pci-core-and-arch-code-to-use-resource_size_t.patch
+++ b/pci/64bit-resource-change-pci-core-and-arch-code-to-use-resource_size_t.patch
@@ -574,7 +574,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #endif	/* __KERNEL__ */
 --- gregkh-2.6.orig/include/linux/pci.h
 +++ gregkh-2.6/include/linux/pci.h
-@@ -404,8 +404,8 @@ int pcibios_enable_device(struct pci_dev
+@@ -407,8 +407,8 @@ int pcibios_enable_device(struct pci_dev
  char *pcibios_setup (char *str);
  
  /* Used only when drivers/pci/setup.c is used */
@@ -585,7 +585,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  void pcibios_update_irq(struct pci_dev *, int irq);
  
  /* Generic PCI functions used internally */
-@@ -532,10 +532,10 @@ void pci_release_region(struct pci_dev *
+@@ -535,10 +535,10 @@ void pci_release_region(struct pci_dev *
  
  /* drivers/pci/bus.c */
  int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
@@ -599,7 +599,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			   void *alignf_data);
  void pci_enable_bridges(struct pci_bus *bus);
  
-@@ -730,7 +730,8 @@ static inline char *pci_name(struct pci_
+@@ -733,7 +733,8 @@ static inline char *pci_name(struct pci_
   */
  #ifndef HAVE_ARCH_PCI_RESOURCE_TO_USER
  static inline void pci_resource_to_user(const struct pci_dev *dev, int bar,
diff --git a/pci/64bit-resource-fix-up-printks-for-resources-in-ide-drivers.patch b/pci/64bit-resource-fix-up-printks-for-resources-in-ide-drivers.patch
index aace93fa9f052..0d2b9d8abbc0b 100644
--- a/pci/64bit-resource-fix-up-printks-for-resources-in-ide-drivers.patch
+++ b/pci/64bit-resource-fix-up-printks-for-resources-in-ide-drivers.patch
@@ -13,11 +13,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---
  drivers/ide/pci/aec62xx.c      |    3 ++-
- drivers/ide/pci/cmd64x.c       |    3 ++-
  drivers/ide/pci/hpt34x.c       |    2 +-
  drivers/ide/pci/pdc202xx_new.c |    4 ++--
  drivers/ide/pci/pdc202xx_old.c |    4 ++--
- 5 files changed, 9 insertions(+), 7 deletions(-)
+ 4 files changed, 7 insertions(+), 6 deletions(-)
 
 --- gregkh-2.6.orig/drivers/ide/pci/aec62xx.c
 +++ gregkh-2.6/drivers/ide/pci/aec62xx.c
@@ -31,18 +30,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	}
  
  	if (bus_speed <= 33)
---- gregkh-2.6.orig/drivers/ide/pci/cmd64x.c
-+++ gregkh-2.6/drivers/ide/pci/cmd64x.c
-@@ -609,7 +609,8 @@ static unsigned int __devinit init_chips
- #ifdef __i386__
- 	if (dev->resource[PCI_ROM_RESOURCE].start) {
- 		pci_write_config_dword(dev, PCI_ROM_ADDRESS, dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
--		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, dev->resource[PCI_ROM_RESOURCE].start);
-+		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
-+			(unsigned long)dev->resource[PCI_ROM_RESOURCE].start);
- 	}
- #endif
- 
 --- gregkh-2.6.orig/drivers/ide/pci/hpt34x.c
 +++ gregkh-2.6/drivers/ide/pci/hpt34x.c
 @@ -176,7 +176,7 @@ static unsigned int __devinit init_chips
@@ -69,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #ifdef CONFIG_PPC_PMAC
 --- gregkh-2.6.orig/drivers/ide/pci/pdc202xx_old.c
 +++ gregkh-2.6/drivers/ide/pci/pdc202xx_old.c
-@@ -544,8 +544,8 @@ static unsigned int __devinit init_chips
+@@ -490,8 +490,8 @@ static unsigned int __devinit init_chips
  	if (dev->resource[PCI_ROM_RESOURCE].start) {
  		pci_write_config_dword(dev, PCI_ROM_ADDRESS,
  			dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
@@ -79,4 +66,4 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +			(unsigned long)dev->resource[PCI_ROM_RESOURCE].start);
  	}
  
- 	/*
+ 	return dev->irq;
diff --git a/pci/pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code.patch b/pci/pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code.patch
index 1e35c374b8ccd..c874c0508fbeb 100644
--- a/pci/pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code.patch
+++ b/pci/pci-legacy-i-o-port-free-driver-changes-to-generic-pci-code.patch
@@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/pci/pci-driver.c
 +++ gregkh-2.6/drivers/pci/pci-driver.c
-@@ -293,7 +293,8 @@ static int pci_default_resume(struct pci
+@@ -318,7 +318,8 @@ static int pci_default_resume(struct pci
  	pci_restore_state(pci_dev);
  	/* if the device was enabled before suspend, reenable */
  	if (pci_dev->is_enabled)
@@ -176,7 +176,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  };
  
  #define pci_dev_g(n) list_entry(n, struct pci_dev, global_list)
-@@ -501,6 +502,7 @@ void pci_update_resource(struct pci_dev 
+@@ -504,6 +505,7 @@ void pci_update_resource(struct pci_dev 
  int pci_assign_resource(struct pci_dev *dev, int i);
  int pci_assign_resource_fixed(struct pci_dev *dev, int i);
  void pci_restore_bars(struct pci_dev *dev);