diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-27 20:09:56 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-27 20:09:56 +0200 |
| commit | 535cee422778acaf701b9243cc6df24408856e8f (patch) | |
| tree | 34c79967328c302f3e01a0366b52dea8161d9b85 /drivers/power/reset/Makefile | |
| parent | Merge tag 'davinci-for-v3.16/edma' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | power: reset: keystone-reset: introduce keystone reset driver (diff) | |
| download | linux-535cee422778acaf701b9243cc6df24408856e8f.tar.xz linux-535cee422778acaf701b9243cc6df24408856e8f.zip | |
Merge tag 'keystone-reset-driver' of git://git.kernel.org/pub/scm/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 <olof@lixom.net>
Diffstat (limited to 'drivers/power/reset/Makefile')
| -rw-r--r-- | drivers/power/reset/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/reset/Makefile b/drivers/power/reset/Makefile index 950fdc011c7a..618541b70207 100644 --- a/drivers/power/reset/Makefile +++ b/drivers/power/reset/Makefile @@ -6,3 +6,4 @@ 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 |