Merge branch 'stable/for-jens-3.13-take-two' of git://git.kernel.org/pub/scm/linux...

[~andy/linux] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 687da899cadb5b0bbe1dd7e04ec6b56d1d000022..3cc8214f9b26630e86eddcb37ac35f7a5f57e4a1 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -154,3 +154,4 @@ obj-$(CONFIG_VME_BUS)               += vme/
 obj-$(CONFIG_IPACK_BUS)                += ipack/
 obj-$(CONFIG_NTB)              += ntb/
 obj-$(CONFIG_FMC)              += fmc/
+obj-$(CONFIG_POWERCAP)         += powercap/