diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 07:32:28 -0400 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /drivers/net/davinci_cpdma.h | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'drivers/net/davinci_cpdma.h')
| -rw-r--r-- | drivers/net/davinci_cpdma.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/davinci_cpdma.h b/drivers/net/davinci_cpdma.h index 868e50ebde45..afa19a0c0d81 100644 --- a/drivers/net/davinci_cpdma.h +++ b/drivers/net/davinci_cpdma.h | |||
| @@ -33,6 +33,7 @@ struct cpdma_params { | |||
| 33 | bool has_soft_reset; | 33 | bool has_soft_reset; |
| 34 | int min_packet_size; | 34 | int min_packet_size; |
| 35 | u32 desc_mem_phys; | 35 | u32 desc_mem_phys; |
| 36 | u32 desc_hw_addr; | ||
| 36 | int desc_mem_size; | 37 | int desc_mem_size; |
| 37 | int desc_align; | 38 | int desc_align; |
| 38 | 39 | ||