diff --git a/[refs] b/[refs] index 258b249cc392..ceb62c968090 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5174d2d2a775998972c04f9875daf04fb156180 +refs/heads/master: 0a6f19db99c4833ad01eccbee51812b8000d63ea diff --git a/trunk/arch/mips/pci/pci.c b/trunk/arch/mips/pci/pci.c index 04e35bcde07c..4040416e0603 100644 --- a/trunk/arch/mips/pci/pci.c +++ b/trunk/arch/mips/pci/pci.c @@ -313,10 +313,8 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus) } } -#ifdef CONFIG_HOTPLUG EXPORT_SYMBOL(PCIBIOS_MIN_IO); EXPORT_SYMBOL(PCIBIOS_MIN_MEM); -#endif int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, enum pci_mmap_state mmap_state, int write_combine)