Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  gcc-4.6: ACPI: fix unused but set variables in ACPI
  ACPI thermal: make procfs I/F depend on CONFIG_ACPI_PROCFS
  ACPI video: make procfs I/F depend on CONFIG_ACPI_PROCFS
  ACPI processor: remove deprecated ACPI procfs I/F
  ACPI power_resource: remove unused procfs I/F
  ACPI: remove deprecated ACPI procfs I/F
  ACPI: introduce drivers/acpi/sysfs.c
  ACPI: introduce module parameter acpi.aml_debug_output
  ACPI: introduce drivers/acpi/debugfs.c
  ACPI, APEI, ERST debug support
  ACPI, APEI, Manage GHES as platform devices
  ACPI, APEI, Rename CPER and GHES severity constants
  ACPI, APEI, Fix a typo of error path of apei_resources_request
  ACPI / ACPICA: Fix reference counting problems with GPE handlers
  ACPI: Add the check of ADR flag in course of finding ACPI handle for PCI device
  ACPI / Sleep: Drop acpi_suspend_finish()
  ACPI / Sleep: Consolidate suspend and hibernation routines
  ACPI / Wakeup: Simplify enabling of wakeup devices
  ACPI / Sleep: Rework enabling wakeup devices
  ACPI / Sleep: Free NVS copy if suspending of devices fails

Fixed up totally buggered "ACPI: fix unused but set variables in ACPI"
patch that doesn't even compile in the merge.

Thanks to Sedat Dilek <sedat.dilek@googlemail.com> for noticing the
breakage before I even pulled.  And a big "Grrr.." at Len for not even
bothering to compile the tree before asking me to pull.

1 files changed, 2 insertions, 9 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 08e0140920e1..b811f2173f6f 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -54,17 +54,10 @@ config ACPI_PROCFS
           they have been replaced by functions in /sys.
           The deprecated files (and their replacements) include:
 
-          /proc/acpi/sleep (/sys/power/state)
-          /proc/acpi/info (/sys/module/acpi/parameters/acpica_version)
-          /proc/acpi/dsdt (/sys/firmware/acpi/tables/DSDT)
-          /proc/acpi/fadt (/sys/firmware/acpi/tables/FACP)
-          /proc/acpi/debug_layer (/sys/module/acpi/parameters/debug_layer)
-          /proc/acpi/debug_level (/sys/module/acpi/parameters/debug_level)
-          /proc/acpi/processor/*/power (/sys/devices/system/cpu/*/cpuidle/*)
-          /proc/acpi/processor/*/performance (/sys/devices/system/cpu/*/
-                cpufreq/*)
           /proc/acpi/processor/*/throttling (/sys/class/thermal/
                 cooling_device*/*)
+          /proc/acpi/video/*/brightness (/sys/class/backlight/)
+          /proc/acpi/thermal_zone/*/* (/sys/class/thermal/)
           This option has no effect on /proc/acpi/ files
           and functions which do not yet exist in /sys.