diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-13 20:28:05 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-13 20:28:05 -0400 |
| commit | db9ca5803566078aafe63cf364ef98b5097e4194 (patch) | |
| tree | ce330cdf21728f00801004e3900c79e4195cd516 /include/linux | |
| parent | bf717b11aec20965d48dea36dea3eea18a75d18c (diff) | |
| parent | eb35cf60e462491249166182e3e755d3d5d91a28 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci-acpi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h index 4877e35ae202..936ef82ed76a 100644 --- a/include/linux/pci-acpi.h +++ b/include/linux/pci-acpi.h | |||
| @@ -50,7 +50,7 @@ | |||
| 50 | extern acpi_status pci_osc_control_set(acpi_handle handle, u32 flags); | 50 | extern acpi_status pci_osc_control_set(acpi_handle handle, u32 flags); |
| 51 | extern acpi_status pci_osc_support_set(u32 flags); | 51 | extern acpi_status pci_osc_support_set(u32 flags); |
| 52 | #else | 52 | #else |
| 53 | #if !defined(acpi_status) | 53 | #if !defined(AE_ERROR) |
| 54 | typedef u32 acpi_status; | 54 | typedef u32 acpi_status; |
| 55 | #define AE_ERROR (acpi_status) (0x0001) | 55 | #define AE_ERROR (acpi_status) (0x0001) |
| 56 | #endif | 56 | #endif |