From 0dab57f216cc970b98bdf74adf1548898ce003e0 Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Thu, 14 Apr 2005 23:12:56 -0400
Subject: [PATCH] --- yaml --- r: 4735 b: refs/heads/master c:
 ebb6e1a6122fd6b7c96470cfd4ce0f04150e5084 h: refs/heads/master i:   4733:
 9bbf5d472c30d8395391241098749932fd6ec2d9   4731:
 1814a97e0d9e72b1714bcbb7d943e0157d009c97   4727:
 a1bf5888a9207b64cbb7ebb0944d38489ff7cd2c   4719:
 5bdb45a194573a030658298163f01d9bb65a10d1   4703:
 fbd2d0af550df107c82c52464e2ca645a44e6141   4671:
 ec3c9fdf4812f674e26e9592b25fd7ac8ebbd5ea   4607:
 c5f1070f819c72aad2a902b7b9a141824c11c9e4 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/acpi/Kconfig      | 8 ++++++++
 trunk/drivers/acpi/sleep/proc.c | 9 +++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5587c7898854..958fcd423f7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d9437759eb6fdb68f7b82cbee20b0fb711d9f0d
+refs/heads/master: ebb6e1a6122fd6b7c96470cfd4ce0f04150e5084
diff --git a/trunk/drivers/acpi/Kconfig b/trunk/drivers/acpi/Kconfig
index fa7f43451891..8b6de1462558 100644
--- a/trunk/drivers/acpi/Kconfig
+++ b/trunk/drivers/acpi/Kconfig
@@ -80,6 +80,14 @@ config ACPI_SLEEP_PROC_FS
 	depends on ACPI_SLEEP && PROC_FS
 	default y
 
+config ACPI_SLEEP_PROC_SLEEP
+	bool "/proc/acpi/sleep (deprecated)"
+	depends on ACPI_SLEEP_PROC_FS
+	default n
+	---help---
+	  Create /proc/acpi/sleep
+	  Deprecated by /sys/power/state
+
 config ACPI_AC
 	tristate "AC Adapter"
 	depends on X86
diff --git a/trunk/drivers/acpi/sleep/proc.c b/trunk/drivers/acpi/sleep/proc.c
index fd7c5a0649af..1be99f0996d6 100644
--- a/trunk/drivers/acpi/sleep/proc.c
+++ b/trunk/drivers/acpi/sleep/proc.c
@@ -13,13 +13,17 @@
 
 #include "sleep.h"
 
+#ifdef	CONFIG_ACPI_SLEEP_PROC_SLEEP
 #define ACPI_SYSTEM_FILE_SLEEP		"sleep"
+#endif
+
 #define ACPI_SYSTEM_FILE_ALARM		"alarm"
 #define ACPI_SYSTEM_FILE_WAKEUP_DEVICE   "wakeup"
 
 #define _COMPONENT		ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME		("sleep")
 
+#ifdef	CONFIG_ACPI_SLEEP_PROC_SLEEP
 
 static int acpi_system_sleep_seq_show(struct seq_file *seq, void *offset)
 {
@@ -78,6 +82,7 @@ acpi_system_write_sleep (
  Done:
 	return error ? error : count;
 }
+#endif	/* CONFIG_ACPI_SLEEP_PROC_SLEEP */
 
 static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset)
 {
@@ -452,6 +457,7 @@ static struct file_operations acpi_system_wakeup_device_fops = {
 	.release	= single_release,
 };
 
+#ifdef	CONFIG_ACPI_SLEEP_PROC_SLEEP
 static struct file_operations acpi_system_sleep_fops = {
 	.open		= acpi_system_sleep_open_fs,
 	.read		= seq_read,
@@ -459,6 +465,7 @@ static struct file_operations acpi_system_sleep_fops = {
 	.llseek		= seq_lseek,
 	.release	= single_release,
 };
+#endif	/* CONFIG_ACPI_SLEEP_PROC_SLEEP */
 
 static struct file_operations acpi_system_alarm_fops = {
 	.open		= acpi_system_alarm_open_fs,
@@ -484,11 +491,13 @@ static int acpi_sleep_proc_init(void)
 	if (acpi_disabled)
 		return 0;
  
+#ifdef	CONFIG_ACPI_SLEEP_PROC_SLEEP
 	/* 'sleep' [R/W]*/
 	entry = create_proc_entry(ACPI_SYSTEM_FILE_SLEEP,
 				  S_IFREG|S_IRUGO|S_IWUSR, acpi_root_dir);
 	if (entry)
 		entry->proc_fops = &acpi_system_sleep_fops;
+#endif
 
 	/* 'alarm' [R/W] */
 	entry = create_proc_entry(ACPI_SYSTEM_FILE_ALARM,