diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-06 00:45:57 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-06 00:45:57 +0400 |
| commit | 640b321aba4b880dfa517a047ef6ccee0a437c3d (patch) | |
| tree | 35206ccc6dc05810a3c3190015f3258ee4b9ab68 | |
| parent | 013c5b4e6611746725cbcc0c39922d36d2968d50 (diff) | |
| parent | 8de078f189da45453d2ed2a04288e329cc169731 (diff) | |
| download | linux-640b321aba4b880dfa517a047ef6ccee0a437c3d.tar.xz | |
Merge tag 'renesas-clk-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Merge "Renesas ARM Based SoC Clk Updates for v3.18" from Simon Horman:
* Add r8a7794 support
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'renesas-clk-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
clk: shmobile: Add r8a7794 support
| -rw-r--r-- | drivers/clk/shmobile/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/shmobile/Makefile b/drivers/clk/shmobile/Makefile index e0029237827a..531d4f6c7050 100644 --- a/drivers/clk/shmobile/Makefile +++ b/drivers/clk/shmobile/Makefile @@ -4,6 +4,7 @@ obj-$(CONFIG_ARCH_R8A7740) += clk-r8a7740.o obj-$(CONFIG_ARCH_R8A7779) += clk-r8a7779.o obj-$(CONFIG_ARCH_R8A7790) += clk-rcar-gen2.o obj-$(CONFIG_ARCH_R8A7791) += clk-rcar-gen2.o +obj-$(CONFIG_ARCH_R8A7794) += clk-rcar-gen2.o obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-div6.o obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += clk-mstp.o # for emply built-in.o |