Merge commit 'v3.0-rc1' into kbuild/kbuild

[karo-tx-linux.git] / drivers / net / davinci_cpdma.h

diff --git a/drivers/net/davinci_cpdma.h b/drivers/net/davinci_cpdma.h
index 868e50ebde45c6d9cfa6147c27b3bde5528b9f6b..afa19a0c0d81000d265a8930c9ecec7220863518 100644 (file)
--- a/drivers/net/davinci_cpdma.h
+++ b/drivers/net/davinci_cpdma.h
@@ -33,6 +33,7 @@ struct cpdma_params {
        bool                    has_soft_reset;
        int                     min_packet_size;
        u32                     desc_mem_phys;
+       u32                     desc_hw_addr;
        int                     desc_mem_size;
        int                     desc_align;