aboutsummaryrefslogtreecommitdiff
path: root/drivers/atm/zatm.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-22 16:33:00 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-22 16:33:00 -0700
commit38afd6adf6bccd7176e88c07cac104d3639aa30d (patch)
tree2142409984b609e51ef60b6a14318dd4e878718a /drivers/atm/zatm.h
parent8ed1383fb7b6685968588141d5934e0e6715e954 (diff)
parent261688d01ec07d3a265b8ace6ec68310fbd96a96 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/atm/zatm.h')
-rw-r--r--drivers/atm/zatm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/atm/zatm.h b/drivers/atm/zatm.h
index 34a0480f63d..416fe0fda60 100644
--- a/drivers/atm/zatm.h
+++ b/drivers/atm/zatm.h
@@ -73,6 +73,7 @@ struct zatm_dev {
int chans; /* map size, must be 2^n */
/*-------------------------------- mailboxes */
unsigned long mbx_start[NR_MBX];/* start addresses */
+ dma_addr_t mbx_dma[NR_MBX];
u16 mbx_end[NR_MBX]; /* end offset (in bytes) */
/*-------------------------------- other pointers */
u32 pool_base; /* Free buffer pool dsc (word addr) */