From: Olof Johansson Date: Tue, 27 May 2014 18:09:56 +0000 (-0700) Subject: Merge tag 'keystone-reset-driver' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=535cee422778acaf701b9243cc6df24408856e8f;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge tag 'keystone-reset-driver' of git://git./linux/kernel/git/ssantosh/linux-keystone into next/drivers Merge "Keystone Reset driver for 3.16" from Santosh Shilimkar: * tag 'keystone-reset-driver' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: power: reset: keystone-reset: introduce keystone reset driver Documentation: dt: add bindings for keystone pll control controller Documentation: dt: add bindings for keystone reset driver Signed-off-by: Olof Johansson --- 535cee422778acaf701b9243cc6df24408856e8f diff --cc drivers/power/reset/Makefile index 950fdc011c7a,802a420741ab..618541b70207 --- a/drivers/power/reset/Makefile +++ b/drivers/power/reset/Makefile @@@ -3,6 -3,6 +3,7 @@@ obj-$(CONFIG_POWER_RESET_GPIO) += gpio- obj-$(CONFIG_POWER_RESET_MSM) += msm-poweroff.o obj-$(CONFIG_POWER_RESET_QNAP) += qnap-poweroff.o obj-$(CONFIG_POWER_RESET_RESTART) += restart-poweroff.o +obj-$(CONFIG_POWER_RESET_SUN6I) += sun6i-reboot.o obj-$(CONFIG_POWER_RESET_VEXPRESS) += vexpress-poweroff.o obj-$(CONFIG_POWER_RESET_XGENE) += xgene-reboot.o + obj-$(CONFIG_POWER_RESET_KEYSTONE) += keystone-reset.o