diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /drivers/pci/pci.c | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
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 d408a3c30426..23d3b17c8cad 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -369,7 +369,7 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state) | |||
| 369 | 369 | ||
| 370 | /* | 370 | /* |
| 371 | * Give firmware a chance to be called, such as ACPI _PRx, _PSx | 371 | * Give firmware a chance to be called, such as ACPI _PRx, _PSx |
| 372 | * Firmware method after natice method ? | 372 | * Firmware method after native method ? |
| 373 | */ | 373 | */ |
| 374 | if (platform_pci_set_power_state) | 374 | if (platform_pci_set_power_state) |
| 375 | platform_pci_set_power_state(dev, state); | 375 | platform_pci_set_power_state(dev, state); |