summaryrefslogtreecommitdiffstats
path: root/arch/ia64/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-07-05 15:31:05 -0600
committerBjorn Helgaas <bhelgaas@google.com>2012-07-05 15:31:05 -0600
commit85a00dd391d2de1e177c5ad8db5672428934ac20 (patch)
tree1dbf69da98dd2e4f6d5dfc75f8dacc00d1664f89 /arch/ia64/pci
parent35e7f73c32ad44a931d918d04e317a7fb0c63e6e (diff)
parent29e8d7bff2f52dd5464a9fb24ece608bbf8fd5ae (diff)
downloadlinux-85a00dd391d2de1e177c5ad8db5672428934ac20.tar.bz2
Merge branch 'pci/myron-pcibios_setup' into next
* pci/myron-pcibios_setup: xtensa/PCI: factor out pcibios_setup() x86/PCI: adjust section annotations for pcibios_setup() unicore32/PCI: adjust section annotations for pcibios_setup() tile/PCI: factor out pcibios_setup() sparc/PCI: factor out pcibios_setup() sh/PCI: adjust section annotations for pcibios_setup() sh/PCI: factor out pcibios_setup() powerpc/PCI: factor out pcibios_setup() parisc/PCI: factor out pcibios_setup() MIPS/PCI: adjust section annotations for pcibios_setup() MIPS/PCI: factor out pcibios_setup() microblaze/PCI: factor out pcibios_setup() ia64/PCI: factor out pcibios_setup() cris/PCI: factor out pcibios_setup() alpha/PCI: factor out pcibios_setup() PCI: pull pcibios_setup() up into core
Diffstat (limited to 'arch/ia64/pci')
-rw-r--r--arch/ia64/pci/pci.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index d173a88d744a..81acc7a57f3e 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -498,15 +498,6 @@ pcibios_align_resource (void *data, const struct resource *res,
return res->start;
}
-/*
- * PCI BIOS setup, always defaults to SAL interface
- */
-char * __init
-pcibios_setup (char *str)
-{
- return str;
-}
-
int
pci_mmap_page_range (struct pci_dev *dev, struct vm_area_struct *vma,
enum pci_mmap_state mmap_state, int write_combine)