Commit e6524140 authored by Deepak Saxena's avatar Deepak Saxena

Merge plexity.net:/home/dsaxena/src/linux-2.5-bk

into plexity.net:/home/dsaxena/src/linux-2.6-for-rmk
parents a685d7b5 ef5eb14d
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
static int debug_pci; static int debug_pci;
static int use_firmware;
/* /*
* We can't use pci_find_device() here since we are * We can't use pci_find_device() here since we are
...@@ -571,6 +572,7 @@ void __init pci_common_init(struct hw_pci *hw) ...@@ -571,6 +572,7 @@ void __init pci_common_init(struct hw_pci *hw)
list_for_each_entry(sys, &hw->buses, node) { list_for_each_entry(sys, &hw->buses, node) {
struct pci_bus *bus = sys->bus; struct pci_bus *bus = sys->bus;
if (!use_firmware) {
/* /*
* Size the bridge windows. * Size the bridge windows.
*/ */
...@@ -580,6 +582,7 @@ void __init pci_common_init(struct hw_pci *hw) ...@@ -580,6 +582,7 @@ void __init pci_common_init(struct hw_pci *hw)
* Assign resources. * Assign resources.
*/ */
pci_bus_assign_resources(bus); pci_bus_assign_resources(bus);
}
/* /*
* Tell drivers about devices found. * Tell drivers about devices found.
...@@ -593,6 +596,9 @@ char * __init pcibios_setup(char *str) ...@@ -593,6 +596,9 @@ char * __init pcibios_setup(char *str)
if (!strcmp(str, "debug")) { if (!strcmp(str, "debug")) {
debug_pci = 1; debug_pci = 1;
return NULL; return NULL;
} else if (!strcmp, "firmware") {
use_firmware = 1;
return NULL;
} }
return str; return str;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment