diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:00:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:00:54 -0400 |
| commit | bb2c018b09b681d43f5e08124b83e362647ea82b (patch) | |
| tree | d794902c78f9fdd04ed88a4b8d451ed6f9292ec0 /arch/mips/pci/pci.c | |
| parent | 82638844d9a8581bbf33201cc209a14876eca167 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
drivers/acpi/processor_throttling.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/pci/pci.c')
| -rw-r--r-- | arch/mips/pci/pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index 358ad6210949..d7d6cb063d26 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c | |||
| @@ -29,8 +29,7 @@ unsigned int pci_probe = PCI_ASSIGN_ALL_BUSSES; | |||
| 29 | * The PCI controller list. | 29 | * The PCI controller list. |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | struct pci_controller *hose_head, **hose_tail = &hose_head; | 32 | static struct pci_controller *hose_head, **hose_tail = &hose_head; |
| 33 | struct pci_controller *pci_isa_hose; | ||
| 34 | 33 | ||
| 35 | unsigned long PCIBIOS_MIN_IO = 0x0000; | 34 | unsigned long PCIBIOS_MIN_IO = 0x0000; |
| 36 | unsigned long PCIBIOS_MIN_MEM = 0; | 35 | unsigned long PCIBIOS_MIN_MEM = 0; |