projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pm+acpi-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
acpi
/
Makefile
diff --git
a/drivers/acpi/Makefile
b/drivers/acpi/Makefile
index bce34afadcd05d250831f098ca533565750345e6..0331f91d56e663d63a7268d1a77bb3ae1080f715 100644
(file)
--- a/
drivers/acpi/Makefile
+++ b/
drivers/acpi/Makefile
@@
-47,7
+47,6
@@
acpi-y += sysfs.o
acpi-$(CONFIG_X86) += acpi_cmos_rtc.o
acpi-$(CONFIG_DEBUG_FS) += debugfs.o
acpi-$(CONFIG_ACPI_NUMA) += numa.o
-acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o
ifdef CONFIG_ACPI_VIDEO
acpi-y += video_detect.o
endif