diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-02-27 10:18:46 -0500 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-02-27 10:18:46 -0500 |
| commit | 018cbffe6819f6f8db20a0a3acd9bab9bfd667e4 (patch) | |
| tree | fadde2521591998dc653fa094c636e8a547e620d /drivers/pci/probe.c | |
| parent | 1dd2980d990068e20045b90c424518cc7f3657ff (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge commit 'v2.6.33' into perf/core
Merge reason:
__percpu annotations need the corresponding sparse address
space definition upstream.
Conflicts:
tools/perf/util/probe-event.c (trivial)
Diffstat (limited to 'drivers/pci/probe.c')
| -rw-r--r-- | drivers/pci/probe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 98ffb2de22e9..446e4a94d7d3 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
| @@ -681,7 +681,7 @@ static void pci_read_irq(struct pci_dev *dev) | |||
| 681 | dev->irq = irq; | 681 | dev->irq = irq; |
| 682 | } | 682 | } |
| 683 | 683 | ||
| 684 | static void set_pcie_port_type(struct pci_dev *pdev) | 684 | void set_pcie_port_type(struct pci_dev *pdev) |
| 685 | { | 685 | { |
| 686 | int pos; | 686 | int pos; |
| 687 | u16 reg16; | 687 | u16 reg16; |
| @@ -695,7 +695,7 @@ static void set_pcie_port_type(struct pci_dev *pdev) | |||
| 695 | pdev->pcie_type = (reg16 & PCI_EXP_FLAGS_TYPE) >> 4; | 695 | pdev->pcie_type = (reg16 & PCI_EXP_FLAGS_TYPE) >> 4; |
| 696 | } | 696 | } |
| 697 | 697 | ||
| 698 | static void set_pcie_hotplug_bridge(struct pci_dev *pdev) | 698 | void set_pcie_hotplug_bridge(struct pci_dev *pdev) |
| 699 | { | 699 | { |
| 700 | int pos; | 700 | int pos; |
| 701 | u16 reg16; | 701 | u16 reg16; |