diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-28 10:58:02 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-28 10:58:02 +1000 |
| commit | f68abdb402f76bd312ca6a72b9d39ff8d4c64371 (patch) | |
| tree | 5ead45fe50618127defdb5cba94657908df5248f /include/linux | |
| parent | bd396912cb0a88816fe4a727340f8040b51fe511 (diff) | |
| parent | a41a7b91772da2c77ac0da74285fd8ebd86a85ba (diff) | |
Merge remote branch 'sh/master'
Diffstat (limited to 'include/linux')
| -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) |