]> www.infradead.org Git - users/willy/linux.git/commitdiff
projects / users / willy / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fedf42b 93a1cee)
Merge branch 'reset/ath79' into reset/next
authorPhilipp Zabel <p.zabel@pengutronix.de>
Sun, 16 Aug 2015 15:10:20 +0000 (17:10 +0200)
committerPhilipp Zabel <p.zabel@pengutronix.de>
Sun, 16 Aug 2015 15:11:20 +0000 (17:11 +0200)
1  2 
drivers/reset/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/reset/Makefile
index ab06aa01cfc72873bf5a3f84f6588fa90b3c08c9,f8db9b744b3ab64a126e30c1c51eb4bbbb30a0cf..85d5904e5480f0f818a051bba74b9cb39ea6874e
--- 1/drivers/reset/Makefile
--- 2/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
Unnamed repository; edit this file 'description' to name the repository.