diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-22 15:32:50 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-22 15:32:50 -0600 |
| commit | 0f6662a49bf1b5a163ed4e6321c382d2390c817b (patch) | |
| tree | f52d6d047c37ce78af25a0db7e4f54737d023fe4 /arch/sparc | |
| parent | 1693c4276d768464058f191998e035e09ceb9e65 (diff) | |
| parent | 809a3bf9f34cb6d0c0383b31b3495fa1ed3508a6 (diff) | |
| download | op-kernel-dev-0f6662a49bf1b5a163ed4e6321c382d2390c817b.zip op-kernel-dev-0f6662a49bf1b5a163ed4e6321c382d2390c817b.tar.gz | |
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 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/pcic.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c index ded3f60..46ba849 100644 --- a/arch/sparc/kernel/pcic.c +++ b/arch/sparc/kernel/pcic.c @@ -884,11 +884,6 @@ void __init sun4m_pci_init_IRQ(void) sparc_config.load_profile_irq = pcic_load_profile_irq; } -int pcibios_assign_resource(struct pci_dev *pdev, int resource) -{ - return -ENXIO; -} - /* * This probably belongs here rather than ioport.c because * we do not want this crud linked into SBus kernels. |
