diff options
| author | Lan Tianyu <tianyu.lan@intel.com> | 2014-05-03 23:07:24 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-05 19:52:09 -0400 |
| commit | e2a7c3d7812369daae56f069eab2e8f3e548d231 (patch) | |
| tree | b9020a5e36759eba88fcb79ee5b7ad6ecf0c5ab6 /drivers/acpi/Makefile | |
| parent | 89ca3b881987f5a4be4c5dbaa7f0df12bbdde2fd (diff) | |
ACPI: Revert "ACPI: Remove CONFIG_ACPI_PROCFS_POWER and cm_sbsc.c"
The commit 1e2d9cd and 7d7ee95 remove ACPI Proc Battery
directory and breaks some old userspace tools. This patch
is to revert 7d7ee95.
Fixes: 7d7ee958867a (ACPI: Remove CONFIG_ACPI_PROCFS_POWER and cm_sbsc.c)
Cc: 3.13+ <stable@vger.kernel.org> # 3.13+
Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/Makefile')
| -rw-r--r-- | drivers/acpi/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 0331f91d56e6..bce34afadcd0 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile | |||
| @@ -47,6 +47,7 @@ acpi-y += sysfs.o | |||
| 47 | acpi-$(CONFIG_X86) += acpi_cmos_rtc.o | 47 | acpi-$(CONFIG_X86) += acpi_cmos_rtc.o |
| 48 | acpi-$(CONFIG_DEBUG_FS) += debugfs.o | 48 | acpi-$(CONFIG_DEBUG_FS) += debugfs.o |
| 49 | acpi-$(CONFIG_ACPI_NUMA) += numa.o | 49 | acpi-$(CONFIG_ACPI_NUMA) += numa.o |
| 50 | acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o | ||
| 50 | ifdef CONFIG_ACPI_VIDEO | 51 | ifdef CONFIG_ACPI_VIDEO |
| 51 | acpi-y += video_detect.o | 52 | acpi-y += video_detect.o |
| 52 | endif | 53 | endif |