diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-23 01:32:50 +0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-23 01:32:50 +0400 |
| commit | 0f6662a49bf1b5a163ed4e6321c382d2390c817b (patch) | |
| tree | f52d6d047c37ce78af25a0db7e4f54737d023fe4 /drivers/pci/pci-sysfs.c | |
| parent | 1693c4276d768464058f191998e035e09ceb9e65 (diff) | |
| parent | 809a3bf9f34cb6d0c0383b31b3495fa1ed3508a6 (diff) | |
| download | linux-0f6662a49bf1b5a163ed4e6321c382d2390c817b.tar.xz | |
Merge branch 'topic/bjorn-trivial' into next
* topic/bjorn-trivial:
PCI: remove useless pcix_set_mmrbc() dev->bus check
PCI: acpiphp: check whether _ADR evaluation succeeded
PCI: shpchp: remove dead code
PCI: fix P2P bridge I/O port window sign extension
PCI: fix upstream P2P bridge checks when enabling OBFF and LTR
PCI: use __weak consistently
PCI: cleanup assign_requested_resources_sorted() kernel-doc warning
sparc/PCI: remove unused pcibios_assign_resource() definition
Diffstat (limited to 'drivers/pci/pci-sysfs.c')
| -rw-r--r-- | drivers/pci/pci-sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 86c63fe45d11..a0b435f20bd6 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -1112,7 +1112,7 @@ static struct bin_attribute pcie_config_attr = { .write = pci_write_config, }; -int __attribute__ ((weak)) pcibios_add_platform_entries(struct pci_dev *dev) +int __weak pcibios_add_platform_entries(struct pci_dev *dev) { return 0; } |