aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-11-20 01:21:47 -0500
committerLen Brown <len.brown@intel.com>2007-11-20 01:21:47 -0500
commite6532b8883760bdf9d251c669a3919fc9457aeca (patch)
treea3e00d9adb1d16b7f7286e365d54de44727ae562 /arch/x86/kernel/acpi
parentd89a9bda14204547f966ed1510a269a44c0b7f5d (diff)
parent4fdb2a05ef5703553fdd28f1b96ebdd79f173657 (diff)
Pull fluff into release branch
Conflicts: drivers/acpi/ec.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/x86/kernel/acpi')
-rw-r--r--arch/x86/kernel/acpi/sleep_64.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/acpi/sleep_64.c b/arch/x86/kernel/acpi/sleep_64.c
index 79475d237071..da42de261ba8 100644
--- 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)
115 115
116__setup("acpi_sleep=", acpi_sleep_setup); 116__setup("acpi_sleep=", acpi_sleep_setup);
117 117
118void acpi_pci_link_exit(void)
119{
120}