diff options
| author | Len Brown <len.brown@intel.com> | 2007-11-20 01:20:00 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-11-20 01:20:00 -0500 |
| commit | c2e46d2e2a8e6ed17fac6154ac7e5fa7fe4efb28 (patch) | |
| tree | 39e4aa997e6a10ef4eebb31487ea15c3c2e70c34 /drivers/acpi/Kconfig | |
| parent | 95b00786f3b8fa99f53931361beeb4c10504ad87 (diff) | |
| parent | 65ea6520375cc09d19ecb46f03ab7ef70bcf06dd (diff) | |
| download | blackbird-op-linux-c2e46d2e2a8e6ed17fac6154ac7e5fa7fe4efb28.tar.gz blackbird-op-linux-c2e46d2e2a8e6ed17fac6154ac7e5fa7fe4efb28.zip | |
Pull procfs-default into release branch
Conflicts:
drivers/acpi/sbs.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/Kconfig')
| -rw-r--r-- | drivers/acpi/Kconfig | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 087a7028ae84..b9f923ef173d 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -50,7 +50,6 @@ config ACPI_SLEEP config ACPI_PROCFS bool "Deprecated /proc/acpi files" depends on PROC_FS - default y ---help--- For backwards compatibility, this option allows deprecated /proc/acpi/ files to exist, even when @@ -61,7 +60,6 @@ config ACPI_PROCFS /proc/acpi/info (/sys/modules/acpi/parameters/acpica_version) /proc/acpi/dsdt (/sys/firmware/acpi/tables/DSDT) /proc/acpi/fadt (/sys/firmware/acpi/tables/FACP) - /proc/acpi/battery (/sys/class/power_supply) /proc/acpi/debug_layer (/sys/module/acpi/parameters/debug_layer) /proc/acpi/debug_level (/sys/module/acpi/parameters/debug_level) @@ -69,7 +67,21 @@ config ACPI_PROCFS and functions which do not yet exist in /sys. Say N to delete /proc/acpi/ files that have moved to /sys/ - +config ACPI_PROCFS_POWER + bool "Deprecated power /proc/acpi folders" + depends on PROC_FS + default y + ---help--- + For backwards compatibility, this option allows + deprecated power /proc/acpi/ folders to exist, even when + they have been replaced by functions in /sys. + The deprecated folders (and their replacements) include: + /proc/acpi/battery/* (/sys/class/power_supply/*) + /proc/acpi/ac_adapter/* (sys/class/power_supply/*) + This option has no effect on /proc/acpi/ folders + and functions, which do not yet exist in /sys + + Say N to delete power /proc/acpi/ folders that have moved to /sys/ config ACPI_PROC_EVENT bool "Deprecated /proc/acpi/event support" depends on PROC_FS |
