diff --git a/[refs] b/[refs] index 27b88ed90567..b57dc03b6797 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2909060699226f70d731d9c242489418f7da4972 +refs/heads/master: 14be538c566f6fd6f8c8abd1687aa5d36a600703 diff --git a/trunk/arch/mips/pci/pci.c b/trunk/arch/mips/pci/pci.c index 2a1104512036..19f6d194a568 100644 --- a/trunk/arch/mips/pci/pci.c +++ b/trunk/arch/mips/pci/pci.c @@ -24,10 +24,6 @@ * assignments. */ -#define PCI_ASSIGN_ALL_BUSSES 1 - -unsigned int pci_probe = PCI_ASSIGN_ALL_BUSSES; - /* * The PCI controller list. */ @@ -238,7 +234,7 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask) unsigned int pcibios_assign_all_busses(void) { - return (pci_probe & PCI_ASSIGN_ALL_BUSSES) ? 1 : 0; + return 1; } int pcibios_enable_device(struct pci_dev *dev, int mask)