diff options
| author | Anton Vorontsov <anton@enomsg.org> | 2013-03-30 15:47:40 -0700 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-03-30 15:47:40 -0700 |
| commit | 18bc4e79fdff1baa82d57ef364590fcdcc0a2612 (patch) | |
| tree | 6d1a086f78d4c39fbb74057b2fd13890d1a8f900 /drivers/power/reset/Makefile | |
| parent | 6e997bb894beef128fcfe1679e0830f97dee6dc2 (diff) | |
| parent | 65deb782858128cde598ac4a9150ab7cdd29dafa (diff) | |
Merge branch 'vexpress' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64
From Catalin Marinas <catalin.marinas@arm.com>:
"... move the vexpress poweroff/restart code from arch/arm to
driver/power/reset so that the code can be reused in arm64."
Diffstat (limited to 'drivers/power/reset/Makefile')
| -rw-r--r-- | drivers/power/reset/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/reset/Makefile b/drivers/power/reset/Makefile index 0f317f50c56..372807fd83f 100644 --- a/drivers/power/reset/Makefile +++ b/drivers/power/reset/Makefile @@ -1,3 +1,4 @@ obj-$(CONFIG_POWER_RESET_GPIO) += gpio-poweroff.o obj-$(CONFIG_POWER_RESET_QNAP) += qnap-poweroff.o -obj-$(CONFIG_POWER_RESET_RESTART) += restart-poweroff.o
\ No newline at end of file +obj-$(CONFIG_POWER_RESET_RESTART) += restart-poweroff.o +obj-$(CONFIG_POWER_RESET_VEXPRESS) += vexpress-poweroff.o |