diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
| commit | fff34b3412b9401a76ba9d021db1bd91cb0e02b6 (patch) | |
| tree | 870ed2d1555004e7939d15b5099017aae61c97b8 /arch/x86/kernel/acpi/sleep.h | |
| parent | 28e1e58fb668e262648fb8ee8a24154633f40507 (diff) | |
| parent | 636802ef96eebe279b22ad9f9dacfe29291e45c7 (diff) | |
Merge branch 'merge' into next
Brings in various bug fixes from 3.6-rcX
Diffstat (limited to 'arch/x86/kernel/acpi/sleep.h')
| -rw-r--r-- | arch/x86/kernel/acpi/sleep.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/acpi/sleep.h b/arch/x86/kernel/acpi/sleep.h index 5653a5791ec9..67f59f8c6956 100644 --- a/arch/x86/kernel/acpi/sleep.h +++ b/arch/x86/kernel/acpi/sleep.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * Variables and functions used by the code in sleep.c | 2 | * Variables and functions used by the code in sleep.c |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/linkage.h> | ||
| 6 | #include <asm/realmode.h> | 5 | #include <asm/realmode.h> |
| 7 | 6 | ||
| 8 | extern unsigned long saved_video_mode; | 7 | extern unsigned long saved_video_mode; |
| @@ -11,7 +10,6 @@ extern long saved_magic; | |||
| 11 | extern int wakeup_pmode_return; | 10 | extern int wakeup_pmode_return; |
| 12 | 11 | ||
| 13 | extern u8 wake_sleep_flags; | 12 | extern u8 wake_sleep_flags; |
| 14 | extern asmlinkage void acpi_enter_s3(void); | ||
| 15 | 13 | ||
| 16 | extern unsigned long acpi_copy_wakeup_routine(unsigned long); | 14 | extern unsigned long acpi_copy_wakeup_routine(unsigned long); |
| 17 | extern void wakeup_long64(void); | 15 | extern void wakeup_long64(void); |