Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 00:59:58 +0000 (11:59 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 00:59:58 +0000 (11:59 +1100)
1  2 
arch/arm/Kconfig
arch/arm/mach-omap2/Kconfig
drivers/dma/acpi-dma.c

Simple merge
@@@ -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
  
Simple merge