diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-08 18:32:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-08 18:32:06 -0400 |
commit | 7b85a88ca7760d6d5f34bdaa793c71d921a3e853 (patch) | |
tree | 821b9860f85ca49bc6fc7a58642b7d1faff8f2fb /include | |
parent | 139ef17a464a222aadf7b543d734a4001d06b720 (diff) | |
parent | 8897c1859521cf33077256725b2377164b130c75 (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
x86 ACPI: Add support for Always Running APIC timer
ACPI x86: Make aperf/mperf MSR access in acpi_cpufreq read_only
ACPI x86: Cleanup acpi_cpufreq structures related to aperf/mperf
ACPICA: delete check for AML access to port 0x81-83
ACPI: WMI: use .notify method instead of installing handler directly
sony-laptop: use .notify method instead of installing handler directly
panasonic-laptop: use .notify method instead of installing handler directly
fujitsu-laptop: use .notify method instead of installing hotkey handler directly
fujitsu-laptop: use .notify method instead of installing handler directly
ACPI: video: use .notify method instead of installing handler directly
ACPI: thermal: use .notify method instead of installing handler directly
ACPI battery: fix async boot oops
ACPI: delete acpi_device.g_list
NULL noise: drivers/platform/x86/panasonic-laptop.c
ACPI: cpufreq: remove dupilcated #include
ACPI: Adjust Kelvin offset to match local implementation
ACPI: convert acpi_device_lock spinlock to mutex
Diffstat (limited to 'include')
-rw-r--r-- | include/acpi/acpi_bus.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index a2228511d4be..c34b11022908 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -270,7 +270,6 @@ struct acpi_device { | |||
270 | struct list_head children; | 270 | struct list_head children; |
271 | struct list_head node; | 271 | struct list_head node; |
272 | struct list_head wakeup_list; | 272 | struct list_head wakeup_list; |
273 | struct list_head g_list; | ||
274 | struct acpi_device_status status; | 273 | struct acpi_device_status status; |
275 | struct acpi_device_flags flags; | 274 | struct acpi_device_flags flags; |
276 | struct acpi_device_pnp pnp; | 275 | struct acpi_device_pnp pnp; |