diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-27 10:50:09 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-27 10:50:09 +1000 |
| commit | d7895d61e70db07a5e816a7abd2d2e5516bb36bc (patch) | |
| tree | 879f9869b42de18eb64700b6c38f5e91e809d73b /include | |
| parent | a17feb8d541faa7d6431fc621461e557b1f7b06d (diff) | |
| parent | a41a7b91772da2c77ac0da74285fd8ebd86a85ba (diff) | |
Merge remote branch 'sh/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/serial_sci.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h index f5364a1de68b..baed2122c5a6 100644 --- 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) |