From f1d8921122318075384a46f92cea7401ea5915cd Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Thu, 25 Aug 2005 12:15:11 -0400
Subject: [PATCH] --- yaml --- r: 7828 b: refs/heads/master c:
 bfea6c2af798d9a882bbc6b9ae9893ab1864d230 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/acpi/Kconfig | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index ccbebdb98849..2209037d71c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb7b6b32644f7a48357e02f8004f88b3220f3494
+refs/heads/master: bfea6c2af798d9a882bbc6b9ae9893ab1864d230
diff --git a/trunk/drivers/acpi/Kconfig b/trunk/drivers/acpi/Kconfig
index 5e8f15ffe99d..1117358256ba 100644
--- a/trunk/drivers/acpi/Kconfig
+++ b/trunk/drivers/acpi/Kconfig
@@ -44,9 +44,9 @@ config ACPI
 if ACPI
 
 config ACPI_SLEEP
-	bool "Sleep States (EXPERIMENTAL)"
+	bool "Sleep States"
 	depends on X86 && (!SMP || SUSPEND_SMP)
-	depends on EXPERIMENTAL && PM
+	depends on PM
 	default y
 	---help---
 	  This option adds support for ACPI suspend states. 
@@ -108,7 +108,6 @@ config ACPI_BUTTON
 config ACPI_VIDEO
 	tristate "Video"
 	depends on X86
-	depends on EXPERIMENTAL
 	default m
 	help
 	  This driver implement the ACPI Extensions For Display Adapters
@@ -120,7 +119,7 @@ config ACPI_VIDEO
 	  for your integrated video device.
 
 config ACPI_HOTKEY
-	tristate "Generic Hotkey"
+	tristate "Generic Hotkey (EXPERIMENTAL)"
 	depends on EXPERIMENTAL
 	depends on X86
 	default n
@@ -296,7 +295,6 @@ config ACPI_SYSTEM
 config X86_PM_TIMER
 	bool "Power Management Timer Support"
 	depends on X86
-	depends on EXPERIMENTAL
 	depends on !X86_64
 	default n
 	help