diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-27 16:14:38 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-27 16:14:38 +0100 |
| commit | b92efa9abffc4a634cd2e7a0f81f8aa6310d67c9 (patch) | |
| tree | 9847508d9b8d4e585f90db4a453bfbc3700c997e /drivers/net/atl1e/atl1e.h | |
| parent | a16fffdd8eb95ebab7dc22414896fe6493951e0e (diff) | |
| parent | be0ea69674ed95e1e98cb3687a241badc756d228 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into avr32-arch
Diffstat (limited to 'drivers/net/atl1e/atl1e.h')
| -rw-r--r-- | drivers/net/atl1e/atl1e.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/atl1e/atl1e.h b/drivers/net/atl1e/atl1e.h index c49550d507a..2bf63b4368e 100644 --- a/drivers/net/atl1e/atl1e.h +++ b/drivers/net/atl1e/atl1e.h @@ -448,7 +448,7 @@ struct atl1e_adapter { /* All Descriptor memory */ dma_addr_t ring_dma; void *ring_vir_addr; - int ring_size; + u32 ring_size; struct atl1e_tx_ring tx_ring; struct atl1e_rx_ring rx_ring; |