From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Feb 2013 01:12:45 +0000 (+1100)
Subject: Merge remote-tracking branch 'pci/next'
X-Git-Tag: next-20130220~83
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5157494d2a54f112cae766412fceae5938d4c9e3;p=karo-tx-linux.git

Merge remote-tracking branch 'pci/next'

Conflicts:
	arch/ia64/pci/pci.c
---

5157494d2a54f112cae766412fceae5938d4c9e3
diff --cc arch/ia64/pci/pci.c
index 55b72ad57329,00e59c7ad3c0..60532ab27346
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@@ -393,7 -396,15 +393,15 @@@ out1
  	return NULL;
  }
  
+ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
+ {
+ 	struct pci_controller *controller = bridge->bus->sysdata;
+ 
+ 	ACPI_HANDLE_SET(&bridge->dev, controller->acpi_handle);
+ 	return 0;
+ }
+ 
 -static int __devinit is_valid_resource(struct pci_dev *dev, int idx)
 +static int is_valid_resource(struct pci_dev *dev, int idx)
  {
  	unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM;
  	struct resource *devr = &dev->resource[idx], *busr;