diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2010-02-16 05:19:18 -0500 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2010-02-16 05:19:18 -0500 |
| commit | ba9341dfef6b0201cd30e3904dcd0a47d3dc35e0 (patch) | |
| tree | d83637979db83bb9d5a23e190148b90b60c976d2 /drivers/pci/pcie/aer/aerdrv_acpi.c | |
| parent | d39e82db73eb876c60d00f00219d767b3be30307 (diff) | |
| parent | f167e1d073278fe231bbdd5d6c24fb9d091aa544 (diff) | |
Merge branch 'fixes' into devel
Diffstat (limited to 'drivers/pci/pcie/aer/aerdrv_acpi.c')
| -rw-r--r-- | drivers/pci/pcie/aer/aerdrv_acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c index 8edb2f300e8f..04814087658d 100644 --- a/drivers/pci/pcie/aer/aerdrv_acpi.c +++ b/drivers/pci/pcie/aer/aerdrv_acpi.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | * | 24 | * |
| 25 | * @return: Zero on success. Nonzero otherwise. | 25 | * @return: Zero on success. Nonzero otherwise. |
| 26 | * | 26 | * |
| 27 | * Invoked when PCIE bus loads AER service driver. To avoid conflict with | 27 | * Invoked when PCIe bus loads AER service driver. To avoid conflict with |
| 28 | * BIOS AER support requires BIOS to yield AER control to OS native driver. | 28 | * BIOS AER support requires BIOS to yield AER control to OS native driver. |
| 29 | **/ | 29 | **/ |
| 30 | int aer_osc_setup(struct pcie_device *pciedev) | 30 | int aer_osc_setup(struct pcie_device *pciedev) |