lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916-power-state', 'ht-warn-2.6.34', 'pnp', 'processor-rename', 'sony-2.6.34', 'suse-bugzilla-531547', 'tz-check', 'video' and 'misc-2.6.34' into release

Browse Source
This commit is contained in:
Len Brown
2010-03-14 21:30:17 -04:00
parent c67fcd670b d060705091 f6bb13aa1e 0c99c5288e 4c81ba4900 7e0e9c0427 149fe9c293 cffdde993a fa80945269 8b7ef6d8f1 70287db87c 38bcb37a6f
commit ec28dcc6b4
8142 changed files with 500772 additions and 232253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/acpi/internal.h
View File

@@ -36,8 +36,6 @@ static inline int acpi_debug_init(void) { return 0; }
int acpi_power_init(void);
int acpi_device_sleep_wake(struct acpi_device *dev,
int enable, int sleep_state, int dev_state);
int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state);
int acpi_disable_wakeup_device_power(struct acpi_device *dev);
int acpi_power_get_inferred_state(struct acpi_device *device);
int acpi_power_transition(struct acpi_device *device, int state);
extern int acpi_power_nocheck;
@@ -51,6 +49,8 @@ void acpi_early_processor_set_pdc(void);
int acpi_ec_init(void);
int acpi_ec_ecdt_probe(void);
int acpi_boot_ec_enable(void);
void acpi_ec_suspend_transactions(void);
void acpi_ec_resume_transactions(void);
/*--------------------------------------------------------------------------
Suspend/Resume