From b2fd90ba0e4b1226d545a4a34b8c5e9e59d97272 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Mon, 18 Oct 2010 18:47:25 -0700
Subject: [PATCH] --- yaml --- r: 217694 b: refs/heads/master c:
 01eac60bccdb0ce49a2937d59da1e4749697a9aa h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/acpi/sleep.c | 4 ++--
 trunk/drivers/acpi/sleep.h | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 79de05557526..f82936c1cb39 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ba8b1c6fe40c314a02e28553c25552d8f1442e7
+refs/heads/master: 01eac60bccdb0ce49a2937d59da1e4749697a9aa
diff --git a/trunk/drivers/acpi/sleep.c b/trunk/drivers/acpi/sleep.c
index 4754ff6e70e6..b9af2c2ff926 100644
--- a/trunk/drivers/acpi/sleep.c
+++ b/trunk/drivers/acpi/sleep.c
@@ -25,7 +25,7 @@
 #include "internal.h"
 #include "sleep.h"
 
-u8 sleep_states[ACPI_S_STATE_COUNT];
+static u8 sleep_states[ACPI_S_STATE_COUNT];
 
 static void acpi_sleep_tts_switch(u32 acpi_state)
 {
@@ -702,7 +702,7 @@ static void acpi_power_off(void)
  * paths through the BIOS, so disable _GTS and _BFS by default,
  * but do speak up and offer the option to enable them.
  */
-void __init acpi_gts_bfs_check(void)
+static void __init acpi_gts_bfs_check(void)
 {
 	acpi_handle dummy;
 
diff --git a/trunk/drivers/acpi/sleep.h b/trunk/drivers/acpi/sleep.h
index d8821805c3bc..74d59c8f4678 100644
--- a/trunk/drivers/acpi/sleep.h
+++ b/trunk/drivers/acpi/sleep.h
@@ -1,5 +1,4 @@
 
-extern u8 sleep_states[];
 extern int acpi_suspend(u32 state);
 
 extern void acpi_enable_wakeup_devices(u8 sleep_state);