diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-28 01:54:08 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-28 01:54:08 +0200 |
| commit | c940c8ce1db3ed3909d31c02aef01a864565519c (patch) | |
| tree | 725597abd9bd910792410ddfe89cc0857d7667b2 /include/acpi | |
| parent | 34bdb1a458baaf3e56843c36deb04283c26a8099 (diff) | |
| parent | 94a409319561ec1847fd9bf996a2d5843ad00932 (diff) | |
| download | linux-c940c8ce1db3ed3909d31c02aef01a864565519c.tar.gz linux-c940c8ce1db3ed3909d31c02aef01a864565519c.tar.bz2 linux-c940c8ce1db3ed3909d31c02aef01a864565519c.zip | |
Merge branch 'acpi-assorted'
* acpi-assorted: (21 commits)
ACPI / thermal: do not always return THERMAL_TREND_RAISING for active trip points
ACPI: video: correct acpi_video_bus_add error processing
ACPI: Fix wrong parameter passed to memblock_reserve
acpi: video: enhance the quirk detect logic of _BQC
ACPI: update comments for acpi_event_status
ACPI: remove "config ACPI_DEBUG_FUNC_TRACE"
PCI / ACPI: Don't query OSC support with all possible controls
ACPI / processor_thermal: avoid null pointer deference error
ACPI / fan: avoid null pointer deference error
ACPI / video: Fix applying indexed initial brightness value.
ACPI / video: Make logic a little easier to understand.
ACPI / video: Fix brightness control initialization for some laptops.
ACPI: Use resource_size() in osl.c
ACPI / acpi_pad: Used PTR_RET
ACPI: suppress compiler warning in container.c
ACPI: suppress compiler warning in battery.c
ACPI: suppress compiler warnings in processor_throttling.c
ACPI: suppress compiler warnings in button.c
ACPI: replace kmalloc+memcpy with kmemdup
ACPI: Remove acpi_pci_bind_root() definition
...
Diffstat (limited to 'include/acpi')
| -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); struct pci_bus; struct pci_dev *acpi_get_pci_dev(acpi_handle); -int acpi_pci_bind_root(struct acpi_device *device); /* Arch-defined function to add a bus to the system */ 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; * The encoding of acpi_event_status is illustrated below. * Note that a set bit (1) indicates the property is TRUE * (e.g. if bit 0 is set then the event is enabled). - * +-------------+-+-+-+ - * | Bits 31:3 |2|1|0| - * +-------------+-+-+-+ - * | | | | - * | | | +- Enabled? - * | | +--- Enabled for wake? - * | +----- Set? + * +-------------+-+-+-+-+ + * | Bits 31:4 |3|2|1|0| + * +-------------+-+-+-+-+ + * | | | | | + * | | | | +- Enabled? + * | | | +--- Enabled for wake? + * | | +----- Set? + * | +------- Has a handler? * +----------- <Reserved> */ typedef u32 acpi_event_status; |