From: Vinod Koul <vinod.k...@intel.com> the symbol CONFIG_IDMA64 should rather be CONFIG_INTEL_IDMA64 to conform to rest of the intel dmaengine drivers. This was found after sorting the entries and trying to place this odd one
Suggested-by: Linus Torvalds <torva...@linux-foundation.org> Acked-by: Andy Shevchenko <andriy.shevche...@linux.intel.com> Signed-off-by: Vinod Koul <vinod.k...@intel.com> (cherry picked from commit 9ab8b4e7cacfc4a03e4f39fe8a090436ce456720) Signed-off-by: Tan Jui Nee <jui.nee....@intel.com> Conflicts: drivers/dma/Kconfig drivers/dma/Makefile --- drivers/dma/Kconfig | 2 +- drivers/dma/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 2c2e174..703df70 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -85,7 +85,7 @@ config INTEL_IOP_ADMA help Enable support for the Intel(R) IOP Series RAID engines. -config IDMA64 +config INTEL_IDMA64 tristate "Intel integrated DMA 64-bit support" select DMA_ENGINE select DMA_VIRTUAL_CHANNELS diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile index c1fe119..9078963 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -14,7 +14,7 @@ obj-$(CONFIG_HSU_DMA) += hsu/ obj-$(CONFIG_MPC512X_DMA) += mpc512x_dma.o obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/ obj-$(CONFIG_MV_XOR) += mv_xor.o -obj-$(CONFIG_IDMA64) += idma64.o +obj-$(CONFIG_INTEL_IDMA64) += idma64.o obj-$(CONFIG_DW_DMAC_CORE) += dw/ obj-$(CONFIG_AT_HDMAC) += at_hdmac.o obj-$(CONFIG_AT_XDMAC) += at_xdmac.o -- 1.9.1 -- _______________________________________________ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto