Merge branch 'x86-nuke-platforms-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 old platform removal from Peter Anvin: "This patchset removes support for several completely obsolete platforms, where the maintainers either have completely vanished or acked the removal. For some of them it is questionable if there even exists functional specimens of the hardware" Geert Uytterhoeven apparently thought this was a April Fool's pull request ;) * 'x86-nuke-platforms-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, platforms: Remove NUMAQ x86, platforms: Remove SGI Visual Workstation x86, apic: Remove support for IBM Summit/EXA chipset x86, apic: Remove support for ia32-based Unisys ES7000
This commit is contained in:
@@ -567,7 +567,6 @@ char * __init pcibios_setup(char *str)
|
||||
pci_probe |= PCI_PROBE_NOEARLY;
|
||||
return NULL;
|
||||
}
|
||||
#ifndef CONFIG_X86_VISWS
|
||||
else if (!strcmp(str, "usepirqmask")) {
|
||||
pci_probe |= PCI_USE_PIRQ_MASK;
|
||||
return NULL;
|
||||
@@ -577,9 +576,7 @@ char * __init pcibios_setup(char *str)
|
||||
} else if (!strncmp(str, "lastbus=", 8)) {
|
||||
pcibios_last_bus = simple_strtol(str+8, NULL, 0);
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
else if (!strcmp(str, "rom")) {
|
||||
} else if (!strcmp(str, "rom")) {
|
||||
pci_probe |= PCI_ASSIGN_ROMS;
|
||||
return NULL;
|
||||
} else if (!strcmp(str, "norom")) {
|
||||
|
Reference in New Issue
Block a user