diff options
| author |   Philipp Zabel <p.zabel@pengutronix.de> | 2015-08-16 17:10:20 +0200 |
|---|---|---|
| committer | Philipp Zabel <p.zabel@pengutronix.de> | 2015-08-16 17:11:20 +0200 |
| commit | 5d44595c2627f7edcd8c24a76b13bd115f9fc2da (patch) | |
| tree | 3ce4063d9d7a53a99ebbe039bf37ede0dcb562b1 /drivers/reset/Makefile | |
| parent | reset: reset-zynq: Adding support for Xilinx Zynq reset controller. (diff) | |
| parent | MIPS: ath79: Add the reset controller to the AR9132 dtsi (diff) | |
| download | linux-dev-5d44595c2627f7edcd8c24a76b13bd115f9fc2da.tar.xz linux-dev-5d44595c2627f7edcd8c24a76b13bd115f9fc2da.zip | |
Merge branch 'reset/ath79' into reset/next
Diffstat (limited to 'drivers/reset/Makefile')
| -rw-r--r-- | drivers/reset/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile index ab06aa01cfc7..85d5904e5480 100644 --- a/drivers/reset/Makefile +++ b/drivers/reset/Makefile @@ -5,3 +5,4 @@ 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 |