From: Vinod Koul <vinod.koul@intel.com>
Date: Mon, 20 Apr 2015 18:51:14 +0000 (+0530)
Subject: Merge branch 'topic/sh' into for-linus
X-Git-Tag: v4.1-rc1~20^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b53c7582805b10d6a32e88e22d16dc469e66a37a;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'topic/sh' into for-linus
---

b53c7582805b10d6a32e88e22d16dc469e66a37a
diff --cc drivers/dma/sh/Makefile
index 221ab19b8f773,489609b7fbd13..b8a598066ce28
--- a/drivers/dma/sh/Makefile
+++ b/drivers/dma/sh/Makefile
@@@ -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