diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-24 16:00:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-24 16:00:02 -0500 |
commit | 71492fd1bdd4734d8efd20fe00ebf31027d86d3c (patch) | |
tree | d98ce4131c47f0027dded482d25528b9a57f44ac /drivers/acpi/internal.h | |
parent | 45e62974fb110da926e2a6c5b357c15639bdc233 (diff) | |
parent | fcb11235d3910c39afece52f6e106a9ca565d34b (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: (34 commits)
classmate-laptop: add support for Classmate PC ACPI devices
hp-wmi: Fix two memleaks
acer-wmi, msi-wmi: Remove needless DMI MODULE_ALIAS
dell-wmi: do not keep driver loaded on unsupported boxes
wmi: Free the allocated acpi objects through wmi_get_event_data
drivers/platform/x86/acerhdf.c: check BIOS information whether it begins with string of table
acerhdf: add new BIOS versions
acerhdf: limit modalias matching to supported
toshiba_acpi: convert to seq_file
asus_acpi: convert to seq_file
ACPI: do not select ACPI_DOCK from ATA_ACPI
sony-laptop: enumerate rfkill devices using SN06
sony-laptop: rfkill support for newer models
ACPI: fix OSC regression that caused aer and pciehp not to load
MAINTAINERS: add maintainer for msi-wmi driver
fujitu-laptop: fix tests of acpi_evaluate_integer() return value
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c: avoid cross-CPU interrupts by using smp_call_function_any()
ACPI: processor: remove _PDC object list from struct acpi_processor
ACPI: processor: change acpi_processor_set_pdc() interface
ACPI: processor: open code acpi_processor_cleanup_pdc
...
Diffstat (limited to 'drivers/acpi/internal.h')
-rw-r--r-- | drivers/acpi/internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 074cf8682d52..cb28e0502acc 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h | |||
@@ -43,6 +43,7 @@ int acpi_power_transition(struct acpi_device *device, int state); | |||
43 | extern int acpi_power_nocheck; | 43 | extern int acpi_power_nocheck; |
44 | 44 | ||
45 | int acpi_wakeup_device_init(void); | 45 | int acpi_wakeup_device_init(void); |
46 | void acpi_early_processor_set_pdc(void); | ||
46 | 47 | ||
47 | /* -------------------------------------------------------------------------- | 48 | /* -------------------------------------------------------------------------- |
48 | Embedded Controller | 49 | Embedded Controller |