diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-11 15:28:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-11 15:28:04 -0700 |
| commit | dc4967e756021f318d125c9f4fa98b958ae9f2de (patch) | |
| tree | 05f6a50d69356ead5e988b214ab5f664389010bd /include/linux | |
| parent | c0bbbc73d58f1b774cd987b5687a478a027f137c (diff) | |
| parent | 8b8c8d280ab2d18fe6e42d671f60d4ffed451cdc (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
[PATCH] PCI: reverse pci config space restore order
[PATCH] PCI: Improve PCI config space writeback
[PATCH] PCI: Error handling on PCI device resume
[PATCH] PCI: fix pciehp compile issue when CONFIG_ACPI is not enabled
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 @@ extern acpi_status pci_osc_control_set(acpi_handle handle, u32 flags); extern acpi_status pci_osc_support_set(u32 flags); #else -#if !defined(acpi_status) +#if !defined(AE_ERROR) typedef u32 acpi_status; #define AE_ERROR (acpi_status) (0x0001) #endif |