summaryrefslogtreecommitdiffstats
path: root/arch/alpha
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/alpha
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/alpha')
-rw-r--r--arch/alpha/kernel/pci.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index 71efc1a5de7e..9816d5a4d176 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -195,12 +195,6 @@ pcibios_init(void)
subsys_initcall(pcibios_init);
-char * __devinit
-pcibios_setup(char *str)
-{
- return str;
-}
-
#ifdef ALPHA_RESTORE_SRM_SETUP
static struct pdev_srm_saved_conf *srm_saved_configs;