From: Philipp Zabel Date: Sun, 16 Aug 2015 15:10:20 +0000 (+0200) Subject: Merge branch 'reset/ath79' into reset/next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5d44595c2627f7edcd8c24a76b13bd115f9fc2da;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'reset/ath79' into reset/next --- 5d44595c2627f7edcd8c24a76b13bd115f9fc2da diff --cc drivers/reset/Makefile index ab06aa01cfc7,f8db9b744b3a..85d5904e5480 --- a/drivers/reset/Makefile +++ b/drivers/reset/Makefile @@@ -4,4 -3,4 +4,5 @@@ obj-$(CONFIG_ARCH_SOCFPGA) += reset-soc obj-$(CONFIG_ARCH_BERLIN) += reset-berlin.o obj-$(CONFIG_ARCH_SUNXI) += reset-sunxi.o obj-$(CONFIG_ARCH_STI) += sti/ +obj-$(CONFIG_ARCH_ZYNQ) += reset-zynq.o + obj-$(CONFIG_ATH79) += reset-ath79.o