diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-14 14:31:07 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-14 14:31:07 +0000 |
| commit | e13b8ae7949106c6a8b1d4f2eb0dbde81b6cd32e (patch) | |
| tree | 01588d5eee318133d93d04aa5c0718fca26309a4 /arch/x86/kernel/acpi/sleep.h | |
| parent | 38a398422b7225aa6a35892843d411d05140cbb4 (diff) | |
| parent | e25dc79e919fb7cae5e2e26c5494d2d90c857965 (diff) | |
Merge branch 'testing/defconfig-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into testing/multiplatform3tracking-multiplatform-llct-20120814.0
Conflicts:
arch/arm/mach-pxa/cm-x2xx.c
sound/soc/ux500/ux500_msp_dai.c
sound/soc/ux500/ux500_msp_i2s.c
sound/soc/ux500/ux500_msp_i2s.h
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 5653a5791ec..67f59f8c695 100644 --- a/arch/x86/kernel/acpi/sleep.h +++ b/arch/x86/kernel/acpi/sleep.h @@ -2,7 +2,6 @@ * Variables and functions used by the code in sleep.c */ -#include <linux/linkage.h> #include <asm/realmode.h> extern unsigned long saved_video_mode; @@ -11,7 +10,6 @@ extern long saved_magic; extern int wakeup_pmode_return; extern u8 wake_sleep_flags; -extern asmlinkage void acpi_enter_s3(void); extern unsigned long acpi_copy_wakeup_routine(unsigned long); extern void wakeup_long64(void); |