From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 Nov 2015 00:59:58 +0000 (+1100)
Subject: Merge remote-tracking branch 'slave-dma/next'
X-Git-Tag: KARO-TXUL-2015-12-04~99
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=5334042fa85da2e52ad709c6b5a95b33e02bc5d5

Merge remote-tracking branch 'slave-dma/next'
---

5334042fa85da2e52ad709c6b5a95b33e02bc5d5
diff --cc arch/arm/mach-omap2/Kconfig
index b61156b87685,4bef66b4325b..5076d3f334d2
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@@ -96,9 -94,7 +96,8 @@@ config ARCH_OMAP2PLU
  	select OMAP_GPMC
  	select PINCTRL
  	select SOC_BUS
- 	select TI_PRIV_EDMA
  	select OMAP_IRQCHIP
 +	select CLKSRC_TI_32K
  	help
  	  Systems based on OMAP2, OMAP3, OMAP4 or OMAP5