diff options
Diffstat (limited to 'include/acpi/acpi_bus.h')
-rw-r--r-- | include/acpi/acpi_bus.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index c65e4ce6c3af..1fa3ffb7c93b 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -248,7 +248,6 @@ struct acpi_device_perf { | |||
248 | /* Wakeup Management */ | 248 | /* Wakeup Management */ |
249 | struct acpi_device_wakeup_flags { | 249 | struct acpi_device_wakeup_flags { |
250 | u8 valid:1; /* Can successfully enable wakeup? */ | 250 | u8 valid:1; /* Can successfully enable wakeup? */ |
251 | u8 prepared:1; /* Has the wake-up capability been enabled? */ | ||
252 | u8 run_wake:1; /* Run-Wake GPE devices */ | 251 | u8 run_wake:1; /* Run-Wake GPE devices */ |
253 | }; | 252 | }; |
254 | 253 | ||
@@ -263,6 +262,7 @@ struct acpi_device_wakeup { | |||
263 | struct acpi_handle_list resources; | 262 | struct acpi_handle_list resources; |
264 | struct acpi_device_wakeup_state state; | 263 | struct acpi_device_wakeup_state state; |
265 | struct acpi_device_wakeup_flags flags; | 264 | struct acpi_device_wakeup_flags flags; |
265 | int prepare_count; | ||
266 | }; | 266 | }; |
267 | 267 | ||
268 | /* Device */ | 268 | /* Device */ |
@@ -369,10 +369,26 @@ int register_acpi_bus_type(struct acpi_bus_type *); | |||
369 | int unregister_acpi_bus_type(struct acpi_bus_type *); | 369 | int unregister_acpi_bus_type(struct acpi_bus_type *); |
370 | struct device *acpi_get_physical_device(acpi_handle); | 370 | struct device *acpi_get_physical_device(acpi_handle); |
371 | 371 | ||
372 | struct acpi_pci_root { | ||
373 | struct list_head node; | ||
374 | struct acpi_device * device; | ||
375 | struct acpi_pci_id id; | ||
376 | struct pci_bus *bus; | ||
377 | u16 segment; | ||
378 | u8 bus_nr; | ||
379 | |||
380 | u32 osc_support_set; /* _OSC state of support bits */ | ||
381 | u32 osc_control_set; /* _OSC state of control bits */ | ||
382 | u32 osc_control_qry; /* the latest _OSC query result */ | ||
383 | |||
384 | u32 osc_queried:1; /* has _OSC control been queried? */ | ||
385 | }; | ||
386 | |||
372 | /* helper */ | 387 | /* helper */ |
373 | acpi_handle acpi_get_child(acpi_handle, acpi_integer); | 388 | acpi_handle acpi_get_child(acpi_handle, acpi_integer); |
374 | int acpi_is_root_bridge(acpi_handle); | 389 | int acpi_is_root_bridge(acpi_handle); |
375 | acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int); | 390 | acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int); |
391 | struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle); | ||
376 | #define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle)) | 392 | #define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle)) |
377 | 393 | ||
378 | #ifdef CONFIG_PM_SLEEP | 394 | #ifdef CONFIG_PM_SLEEP |