Merge branch 'topic/sh' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Mon, 20 Apr 2015 18:51:14 +0000 (00:21 +0530)
committerVinod Koul <vinod.koul@intel.com>
Mon, 20 Apr 2015 18:51:14 +0000 (00:21 +0530)
1  2 
drivers/dma/sh/Kconfig
drivers/dma/sh/Makefile

Simple merge
@@@ -15,6 -15,4 +15,5 @@@ obj-$(CONFIG_SH_DMAE) += shdma.
  
  obj-$(CONFIG_SUDMAC) += sudmac.o
  obj-$(CONFIG_RCAR_HPB_DMAE) += rcar-hpbdma.o
- obj-$(CONFIG_RCAR_AUDMAC_PP) += rcar-audmapp.o
  obj-$(CONFIG_RCAR_DMAC) += rcar-dmac.o
 +obj-$(CONFIG_RENESAS_USB_DMAC) += usb-dmac.o