Merge branch 'next' into for-linus

1 files changed, 1 insertions, 2 deletions

diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h
index 8bffe9ae2ca0..369273a52679 100644
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@ -67,6 +67,7 @@ enum {
         SCIx_IRDA_REGTYPE,
         SCIx_SCIFA_REGTYPE,
         SCIx_SCIFB_REGTYPE,
+        SCIx_SH2_SCIF_FIFODATA_REGTYPE,
         SCIx_SH3_SCIF_REGTYPE,
         SCIx_SH4_SCIF_REGTYPE,
         SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE,
@@ -131,8 +132,6 @@ struct plat_sci_port {
 
         struct plat_sci_port_ops        *ops;
 
-        struct device   *dma_dev;
-
         unsigned int    dma_slave_tx;
         unsigned int    dma_slave_rx;
 };