diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-09 14:58:20 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-09 14:58:20 +1100 |
| commit | fd0e0cd057d7458513dacf7c297ce497e0866c6c (patch) | |
| tree | cb430a245ebd981df388035d825bc3e36d38262a /drivers/net | |
| parent | 9663231b76de86fbb496b9f64da55cb268c948f1 (diff) | |
| parent | 8671139b1da50fee188646d042c3757bc2945e14 (diff) | |
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
MAINTAINERS
fs/eventpoll.c
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/atl1c/atl1c.h | 4 | ||||
| -rw-r--r-- | drivers/net/qla3xxx.c | 2 | ||||
| -rw-r--r-- | drivers/net/sungem.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/atl1c/atl1c.h b/drivers/net/atl1c/atl1c.h index 9ab58097fa2e..7cb375e0e29c 100644 --- a/drivers/net/atl1c/atl1c.h +++ b/drivers/net/atl1c/atl1c.h @@ -265,7 +265,7 @@ struct atl1c_recv_ret_status { __le32 word3; }; -/* RFD desciptor */ +/* RFD descriptor */ struct atl1c_rx_free_desc { __le64 buffer_addr; }; @@ -531,7 +531,7 @@ struct atl1c_rfd_ring { struct atl1c_buffer *buffer_info; }; -/* receive return desciptor (rrd) ring */ +/* receive return descriptor (rrd) ring */ struct atl1c_rrd_ring { void *desc; /* descriptor ring virtual address */ dma_addr_t dma; /* descriptor ring physical address */ diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c index 2d21c60085bc..348b4f1367c9 100644 --- a/drivers/net/qla3xxx.c +++ b/drivers/net/qla3xxx.c @@ -2460,7 +2460,7 @@ map_error: * The 3032 supports sglists by using the 3 addr/len pairs (ALP) * in the IOCB plus a chain of outbound address lists (OAL) that * each contain 5 ALPs. The last ALP of the IOCB (3rd) or OAL (5th) - * will used to point to an OAL when more ALP entries are required. + * will be used to point to an OAL when more ALP entries are required. * The IOCB is always the top of the chain followed by one or more * OALs (when necessary). */ diff --git a/drivers/net/sungem.h b/drivers/net/sungem.h index ede017872367..d225077964e2 100644 --- a/drivers/net/sungem.h +++ b/drivers/net/sungem.h @@ -843,7 +843,7 @@ struct gem_txd { /* GEM requires that RX descriptors are provided four at a time, * aligned. Also, the RX ring may not wrap around. This means that - * there will be at least 4 unused desciptor entries in the middle + * there will be at least 4 unused descriptor entries in the middle * of the RX ring at all times. * * Similar to HME, GEM assumes that it can write garbage bytes before |