Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 7828
b: refs/heads/master
c: bfea6c2
h: refs/heads/master
v: v3
  • Loading branch information
Len Brown committed Aug 25, 2005
1 parent 35ae5e2 commit f1d8921
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: eb7b6b32644f7a48357e02f8004f88b3220f3494
refs/heads/master: bfea6c2af798d9a882bbc6b9ae9893ab1864d230
8 changes: 3 additions & 5 deletions trunk/drivers/acpi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit f1d8921

Please sign in to comment.