Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 0 insertions, 5 deletions

diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 21402ffd7c98..4dfce154d4af 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -76,11 +76,6 @@ pcibios_align_resource(void *data, struct resource *res,
         res->start = start;
 }
 
-struct pci_controller * __init alloc_pci_controller(void)
-{
-        return alloc_bootmem(sizeof(struct pci_controller));
-}
-
 void __init register_pci_controller(struct pci_controller *hose)
 {
         *hose_tail = hose;