diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-21 17:38:22 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-21 17:38:22 -0700 |
commit | 94aca80897501f994c795cffc458ecd0404377c7 (patch) | |
tree | 312f96755c4e7ab4c50766aea35c9e7aa2ebe015 /drivers/acpi/Makefile | |
parent | 03c1b4e8e560455a2634a76998883a22f1a01207 (diff) | |
parent | 368b69a5b010cb00fc9ea04d588cff69af1a1359 (diff) | |
download | op-kernel-dev-94aca80897501f994c795cffc458ecd0404377c7.zip op-kernel-dev-94aca80897501f994c795cffc458ecd0404377c7.tar.gz |
Merge remote-tracking branch 'origin/x86/urgent' into x86/vdso
Resolved Conflicts:
arch/x86/vdso/vdso32-setup.c
Signed-off-by: H. Peter Anvin <hpa@linux.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 0331f91..bce34af 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -47,6 +47,7 @@ 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 |