projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d3beab 3cd44dc)
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 patch | diff1 | diff2 | blob | history
drivers/dma/sh/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/dma/sh/Kconfig
Simple merge
diff --cc drivers/dma/sh/Makefile
index 221ab19b8f773fba251347964042f6614a27ff1a,489609b7fbd139d926fa20ea5bd26ad34a87bf13..b8a598066ce28a657d62af90a1a2ef57fbc2c866
--- 1/drivers/dma/sh/Makefile
--- 2/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
John Crispins staging tree