diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /drivers/acpi/internal.h | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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 |