diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-10 10:28:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-10 10:28:51 -0400 |
| commit | 2169ce92ca996bdbb0baa8b99f928eb5e9a8f3ab (patch) | |
| tree | b3569e3c80e9b92042d4e750438ade54320fe4a6 /Documentation | |
| parent | 7fc7693627f363820c0e95d1e082f73c197f83c4 (diff) | |
| parent | f483d3923dc3a6394c483e28ccb3fe700bdf399e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI: conditional resource-reallocation through kernel parameter pci=realloc
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index fd248a318211..aa47be71df4c 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -2015,6 +2015,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
| 2015 | the default. | 2015 | the default. |
| 2016 | off: Turn ECRC off | 2016 | off: Turn ECRC off |
| 2017 | on: Turn ECRC on. | 2017 | on: Turn ECRC on. |
| 2018 | realloc reallocate PCI resources if allocations done by BIOS | ||
| 2019 | are erroneous. | ||
| 2018 | 2020 | ||
| 2019 | pcie_aspm= [PCIE] Forcibly enable or disable PCIe Active State Power | 2021 | pcie_aspm= [PCIE] Forcibly enable or disable PCIe Active State Power |
| 2020 | Management. | 2022 | Management. |