git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...
[pandora-kernel.git]
/
arch
/
i386
/
pci
/
common.c
diff --git
a/arch/i386/pci/common.c
b/arch/i386/pci/common.c
index
0a362e3
..
68bce19
100644
(file)
--- a/
arch/i386/pci/common.c
+++ b/
arch/i386/pci/common.c
@@
-242,6
+242,10
@@
char * __devinit pcibios_setup(char *str)
acpi_noirq_set();
return NULL;
}
acpi_noirq_set();
return NULL;
}
+ else if (!strcmp(str, "noearly")) {
+ pci_probe |= PCI_PROBE_NOEARLY;
+ return NULL;
+ }
#ifndef CONFIG_X86_VISWS
else if (!strcmp(str, "usepirqmask")) {
pci_probe |= PCI_USE_PIRQ_MASK;
#ifndef CONFIG_X86_VISWS
else if (!strcmp(str, "usepirqmask")) {
pci_probe |= PCI_USE_PIRQ_MASK;