Merge branch 'for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
[linux-2.6-block.git] / drivers / powercap / Makefile
CommitLineData
75d2364e 1obj-$(CONFIG_POWERCAP) += powercap_sys.o
2d281d81 2obj-$(CONFIG_INTEL_RAPL) += intel_rapl.o