diff options
| author | Colin Cross <ccross@android.com> | 2011-07-12 20:11:00 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-07-12 20:11:00 -0700 |
| commit | 2340c679cabc5477598ee3c9c2044ec8893d42fd (patch) | |
| tree | 2cf2848bea005b9d807710f23dc5519191ca8215 /drivers/pci/pci.c | |
| parent | 9a489d92af45a7d7c1bba9e0803f73f95d2fd13c (diff) | |
| parent | 620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc (diff) | |
| download | kernel_samsung_tuna-2340c679cabc5477598ee3c9c2044ec8893d42fd.zip kernel_samsung_tuna-2340c679cabc5477598ee3c9c2044ec8893d42fd.tar.gz kernel_samsung_tuna-2340c679cabc5477598ee3c9c2044ec8893d42fd.tar.bz2 | |
Merge commit 'v3.0-rc7' into linux-omap-3.0
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 2c5b9b9..692671b 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3483,6 +3483,8 @@ static int __init pci_setup(char *str) pci_no_msi(); } else if (!strcmp(str, "noaer")) { pci_no_aer(); + } else if (!strncmp(str, "realloc", 7)) { + pci_realloc(); } else if (!strcmp(str, "nodomains")) { pci_no_domains(); } else if (!strncmp(str, "cbiosize=", 9)) { |