diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /drivers/net/davinci_cpdma.h | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
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 | ||