Merge branch 'master' into for-next

[firefly-linux-kernel-4.4.55.git] / include / linux / serial_sci.h

diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h
index f5364a1de68b105dac76e0125e93e767c21c2836..baed2122c5a608b209cf68f398cf6875ca2f6224 100644 (file)
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@ -2,9 +2,7 @@
 #define __LINUX_SERIAL_SCI_H
 
 #include <linux/serial_core.h>
-#ifdef CONFIG_SERIAL_SH_SCI_DMA
-#include <asm/dmaengine.h>
-#endif
+#include <linux/sh_dma.h>
 
 /*
  * Generic header for SuperH SCI(F) (used by sh/sh64/h8300 and related parts)