Merge branch 'next' (accumulated 3.16 merge window patches) into master

[firefly-linux-kernel-4.4.55.git] / drivers / reset / Makefile

diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile
index 4f60caf750ceb90e860e00d9ffed55cd74a4ec03..60fed3d7820b75fc0a0a8fd2157bb7a84918ff79 100644 (file)
--- a/drivers/reset/Makefile
+++ b/drivers/reset/Makefile
@@ -1,3 +1,4 @@
 obj-$(CONFIG_RESET_CONTROLLER) += core.o
+obj-$(CONFIG_ARCH_SOCFPGA) += reset-socfpga.o
 obj-$(CONFIG_ARCH_SUNXI) += reset-sunxi.o
 obj-$(CONFIG_ARCH_STI) += sti/