diff options
| author | Barry Song <Barry.Song@csr.com> | 2011-10-24 05:40:40 -0400 |
|---|---|---|
| committer | Barry Song <Barry.Song@csr.com> | 2011-10-24 05:45:43 -0400 |
| commit | 1e11bec9b09a28f81dd3173fec6b1c6c56b5e299 (patch) | |
| tree | cddb92f82bda3a5f362bb6d9f775d25dd1205e6b /drivers/pci/pci.c | |
| parent | 2558bd99cb1426a05ac8f1c78dc9c75a83ceb4bb (diff) | |
| parent | 91c2ebb90b1890abc648ba9dec5608cbc97e1cb9 (diff) | |
Merge branch 'l2x0' of rmk tree into prima2-l2x0
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 0ce67423a0a3..4e84fd4a4312 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -77,7 +77,7 @@ unsigned long pci_cardbus_mem_size = DEFAULT_CARDBUS_MEM_SIZE; | |||
| 77 | unsigned long pci_hotplug_io_size = DEFAULT_HOTPLUG_IO_SIZE; | 77 | unsigned long pci_hotplug_io_size = DEFAULT_HOTPLUG_IO_SIZE; |
| 78 | unsigned long pci_hotplug_mem_size = DEFAULT_HOTPLUG_MEM_SIZE; | 78 | unsigned long pci_hotplug_mem_size = DEFAULT_HOTPLUG_MEM_SIZE; |
| 79 | 79 | ||
| 80 | enum pcie_bus_config_types pcie_bus_config = PCIE_BUS_PERFORMANCE; | 80 | enum pcie_bus_config_types pcie_bus_config = PCIE_BUS_SAFE; |
| 81 | 81 | ||
| 82 | /* | 82 | /* |
| 83 | * The default CLS is used if arch didn't set CLS explicitly and not | 83 | * The default CLS is used if arch didn't set CLS explicitly and not |