From: Tom Rini <trini@konsulko.com>
Date: Mon, 15 Aug 2016 21:31:23 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-atmel
X-Git-Tag: v2016.09-rc2~47
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0fcb9f07a1d086fc6951c08d2fc1cf6048bd54e2;p=oweals%2Fu-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-atmel
---

0fcb9f07a1d086fc6951c08d2fc1cf6048bd54e2
diff --cc drivers/clk/Kconfig
index 7dd56738b0,3da63c0dd1..8f3b96a973
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -20,8 -20,8 +20,9 @@@ config SPL_CL
  	  setting up clocks within SPL, and allows the same drivers to be
  	  used as U-Boot proper.
  
 +source "drivers/clk/tegra/Kconfig"
  source "drivers/clk/uniphier/Kconfig"
  source "drivers/clk/exynos/Kconfig"
+ source "drivers/clk/at91/Kconfig"
  
  endmenu
diff --cc drivers/clk/Makefile
index 463b1d647d,65de0082b4..778d7486f0
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -10,7 -10,6 +10,8 @@@ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip
  obj-$(CONFIG_SANDBOX) += clk_sandbox.o
  obj-$(CONFIG_SANDBOX) += clk_sandbox_test.o
  obj-$(CONFIG_MACH_PIC32) += clk_pic32.o
 +
 +obj-y += tegra/
  obj-$(CONFIG_CLK_UNIPHIER) += uniphier/
  obj-$(CONFIG_CLK_EXYNOS) += exynos/
+ obj-$(CONFIG_CLK_AT91) += at91/