git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 89ca3b8)
ACPI: Revert "ACPI: Remove CONFIG_ACPI_PROCFS_POWER and cm_sbsc.c"
authorLan Tianyu <tianyu.lan@intel.com>
Sun, 4 May 2014 03:07:24 +0000 (11:07 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 5 May 2014 23:52:09 +0000 (01:52 +0200)
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>
drivers/acpi/Kconfig patch | blob | history
drivers/acpi/Makefile patch | blob | history
drivers/acpi/cm_sbs.c [new file with mode: 0644] patch | blob

diff --cc drivers/acpi/Kconfig
Simple merge
diff --cc drivers/acpi/Makefile
Simple merge
diff --cc drivers/acpi/cm_sbs.c
Simple merge
Pandora Kernel Repository