git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
linux
/
pci-acpi.h
diff --git
a/include/linux/pci-acpi.h
b/include/linux/pci-acpi.h
index
857126a
..
936ef82
100644
(file)
--- a/
include/linux/pci-acpi.h
+++ b/
include/linux/pci-acpi.h
@@
-47,14
+47,15
@@
OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL)
#ifdef CONFIG_ACPI
OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL)
#ifdef CONFIG_ACPI
-extern acpi_status pci_osc_control_set(u32 flags);
+extern acpi_status pci_osc_control_set(
acpi_handle handle,
u32 flags);
extern acpi_status pci_osc_support_set(u32 flags);
#else
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
typedef u32 acpi_status;
#define AE_ERROR (acpi_status) (0x0001)
#endif
-static inline acpi_status pci_osc_control_set(u32 flags) {return AE_ERROR;}
+static inline acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)
+{return AE_ERROR;}
static inline acpi_status pci_osc_support_set(u32 flags) {return AE_ERROR;}
#endif
static inline acpi_status pci_osc_support_set(u32 flags) {return AE_ERROR;}
#endif