Merge branch 'linus' into perf/core

[~andy/linux] / include / linux / of_dma.h

diff --git a/include/linux/of_dma.h b/include/linux/of_dma.h
index 364dda734877d2b9a1d045d8082de2542420a475..ae36298ba076eb5187b1fff7bffc96f8c0b6a28a 100644 (file)
--- a/include/linux/of_dma.h
+++ b/include/linux/of_dma.h
@@ -21,7 +21,6 @@ struct device_node;
 struct of_dma {
        struct list_head        of_dma_controllers;
        struct device_node      *of_node;
-       int                     of_dma_nbcells;
        struct dma_chan         *(*of_dma_xlate)
                                (struct of_phandle_args *, struct of_dma *);
        void                    *of_dma_data;