summaryrefslogtreecommitdiff
path: root/drivers/power/reset/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-09-05 10:00:30 +0300
committerIngo Molnar <mingo@kernel.org>2015-09-05 10:00:47 +0300
commit95cd2ea7d54b41b0b2828587f108fe270d59eede (patch)
tree623675092834a6a92ac1ef28cc5abb930c9a11b0 /drivers/power/reset/Makefile
parent66c117d7fa2ae429911e60d84bf31a90b2b96189 (diff)
parente713c80a4e49d4bed5324d24755e42bf01c87556 (diff)
downloadlinux-95cd2ea7d54b41b0b2828587f108fe270d59eede.tar.xz
Merge branch 'linus' into x86/urgent, to be able to merge a dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/power/reset/Makefile')
-rw-r--r--drivers/power/reset/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/reset/Makefile b/drivers/power/reset/Makefile
index dbe06c368743..096fa67047f6 100644
--- a/drivers/power/reset/Makefile
+++ b/drivers/power/reset/Makefile
@@ -19,3 +19,4 @@ obj-$(CONFIG_POWER_RESET_KEYSTONE) += keystone-reset.o
obj-$(CONFIG_POWER_RESET_SYSCON) += syscon-reboot.o
obj-$(CONFIG_POWER_RESET_SYSCON_POWEROFF) += syscon-poweroff.o
obj-$(CONFIG_POWER_RESET_RMOBILE) += rmobile-reset.o
+obj-$(CONFIG_POWER_RESET_ZX) += zx-reboot.o