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 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
acpi
/
sleep_64.c
diff --git
a/arch/x86/kernel/acpi/sleep_64.c
b/arch/x86/kernel/acpi/sleep_64.c
index 79475d2370713a96cff45a1cc5aada1a4eedc093..da42de261ba8d7b4394b319a46aa04ebea5dbeea 100644
(file)
--- a/
arch/x86/kernel/acpi/sleep_64.c
+++ b/
arch/x86/kernel/acpi/sleep_64.c
@@
-115,6
+115,3
@@
static int __init acpi_sleep_setup(char *str)
__setup("acpi_sleep=", acpi_sleep_setup);
-void acpi_pci_link_exit(void)
-{
-}