projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'acpi-pmic'
[linux-2.6-block.git]
/
drivers
/
acpi
/
Makefile
diff --git
a/drivers/acpi/Makefile
b/drivers/acpi/Makefile
index 5da9d4b8f23f23be2e95f05c12262a2c995c07cf..5b271f492be3a1801ccec059c1736537858b6f39 100644
(file)
--- a/
drivers/acpi/Makefile
+++ b/
drivers/acpi/Makefile
@@
-101,4
+101,6
@@
obj-$(CONFIG_CRC_PMIC_OPREGION) += pmic/intel_pmic_crc.o
obj-$(CONFIG_XPOWER_PMIC_OPREGION) += pmic/intel_pmic_xpower.o
obj-$(CONFIG_BXT_WC_PMIC_OPREGION) += pmic/intel_pmic_bxtwc.o
+obj-$(CONFIG_ACPI_CONFIGFS) += acpi_configfs.o
+
video-objs += acpi_video.o video_detect.o