Merge branch 'omap-for-v3.13/fixes-take4' into omap-for-v3.14/board-removal
[cascardo/linux.git] / drivers / powercap / Makefile
1 obj-$(CONFIG_POWERCAP)  += powercap_sys.o
2 obj-$(CONFIG_INTEL_RAPL) += intel_rapl.o