From 66da22d61512d670292df1e0bca2d44c3b1058d5 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Tue, 8 Jan 2008 00:10:57 +0100 Subject: [PATCH] --- yaml --- r: 82394 b: refs/heads/master c: c9b6c8f68ee48e1e3dbb53e13316757e2c0b584d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/sleep/main.c | 4 +++- trunk/drivers/acpi/sleep/sleep.h | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 879582e35621..57dc301ac1f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7258ec5d11ead6db25575734f10f4586c0157463 +refs/heads/master: c9b6c8f68ee48e1e3dbb53e13316757e2c0b584d diff --git a/trunk/drivers/acpi/sleep/main.c b/trunk/drivers/acpi/sleep/main.c index 10db8991bd15..485de1347075 100644 --- a/trunk/drivers/acpi/sleep/main.c +++ b/trunk/drivers/acpi/sleep/main.c @@ -43,7 +43,7 @@ static int __init acpi_new_pts_ordering(char *str) __setup("acpi_new_pts_ordering", acpi_new_pts_ordering); #endif -int acpi_sleep_prepare(u32 acpi_state) +static int acpi_sleep_prepare(u32 acpi_state) { #ifdef CONFIG_ACPI_SLEEP /* do we have a wakeup address for S2 and S3? */ @@ -59,6 +59,8 @@ int acpi_sleep_prepare(u32 acpi_state) ACPI_FLUSH_CPU_CACHE(); acpi_enable_wakeup_device_prep(acpi_state); #endif + printk(KERN_INFO PREFIX "Preparing to enter system sleep state S%d\n", + acpi_state); acpi_enter_sleep_state_prep(acpi_state); return 0; } diff --git a/trunk/drivers/acpi/sleep/sleep.h b/trunk/drivers/acpi/sleep/sleep.h index a2ea125ae2d0..cfaf8f5b0a14 100644 --- a/trunk/drivers/acpi/sleep/sleep.h +++ b/trunk/drivers/acpi/sleep/sleep.h @@ -5,5 +5,3 @@ extern int acpi_suspend (u32 state); extern void acpi_enable_wakeup_device_prep(u8 sleep_state); extern void acpi_enable_wakeup_device(u8 sleep_state); extern void acpi_disable_wakeup_device(u8 sleep_state); - -extern int acpi_sleep_prepare(u32 acpi_state);