diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/acpi/acpi_drivers.h | 1 | ||||
-rw-r--r-- | include/acpi/actypes.h | 15 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index 627749af0ba7..e6168a24b9f0 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h | |||
@@ -95,7 +95,6 @@ int acpi_pci_link_free_irq(acpi_handle handle); | |||
95 | struct pci_bus; | 95 | struct pci_bus; |
96 | 96 | ||
97 | struct pci_dev *acpi_get_pci_dev(acpi_handle); | 97 | struct pci_dev *acpi_get_pci_dev(acpi_handle); |
98 | int acpi_pci_bind_root(struct acpi_device *device); | ||
99 | 98 | ||
100 | /* Arch-defined function to add a bus to the system */ | 99 | /* Arch-defined function to add a bus to the system */ |
101 | 100 | ||
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index 3fac1be2d8b4..a64adcc29ae5 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h | |||
@@ -650,13 +650,14 @@ typedef u32 acpi_event_type; | |||
650 | * The encoding of acpi_event_status is illustrated below. | 650 | * The encoding of acpi_event_status is illustrated below. |
651 | * Note that a set bit (1) indicates the property is TRUE | 651 | * Note that a set bit (1) indicates the property is TRUE |
652 | * (e.g. if bit 0 is set then the event is enabled). | 652 | * (e.g. if bit 0 is set then the event is enabled). |
653 | * +-------------+-+-+-+ | 653 | * +-------------+-+-+-+-+ |
654 | * | Bits 31:3 |2|1|0| | 654 | * | Bits 31:4 |3|2|1|0| |
655 | * +-------------+-+-+-+ | 655 | * +-------------+-+-+-+-+ |
656 | * | | | | | 656 | * | | | | | |
657 | * | | | +- Enabled? | 657 | * | | | | +- Enabled? |
658 | * | | +--- Enabled for wake? | 658 | * | | | +--- Enabled for wake? |
659 | * | +----- Set? | 659 | * | | +----- Set? |
660 | * | +------- Has a handler? | ||
660 | * +----------- <Reserved> | 661 | * +----------- <Reserved> |
661 | */ | 662 | */ |
662 | typedef u32 acpi_event_status; | 663 | typedef u32 acpi_event_status; |