git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[sfrench/cifs-2.6.git]
/
arch
/
x86_64
/
kernel
/
acpi
/
sleep.c
diff --git
a/arch/x86_64/kernel/acpi/sleep.c
b/arch/x86_64/kernel/acpi/sleep.c
index 5ebf62c7a3d2ba936c2e22dfcd0b0ae02b9bdde5..23178ce6c78380bc29f85e146e375676cd4e5242 100644
(file)
--- a/
arch/x86_64/kernel/acpi/sleep.c
+++ b/
arch/x86_64/kernel/acpi/sleep.c
@@
-58,7
+58,7
@@
unsigned long acpi_wakeup_address = 0;
unsigned long acpi_video_flags;
extern char wakeup_start, wakeup_end;
-extern unsigned long
FASTCALL(acpi_copy_wakeup_routine(unsigned long)
);
+extern unsigned long
acpi_copy_wakeup_routine(unsigned long
);
static pgd_t low_ptr;