diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/pasemi_mac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c index daba11062d3b..8892b658655c 100644 --- a/drivers/net/pasemi_mac.c +++ b/drivers/net/pasemi_mac.c | |||
@@ -552,7 +552,7 @@ static int pasemi_mac_clean_tx(struct pasemi_mac *mac) | |||
552 | struct pas_dma_xct_descr *dp; | 552 | struct pas_dma_xct_descr *dp; |
553 | unsigned int start, count, limit; | 553 | unsigned int start, count, limit; |
554 | unsigned int total_count; | 554 | unsigned int total_count; |
555 | int flags; | 555 | unsigned long flags; |
556 | struct sk_buff *skbs[32]; | 556 | struct sk_buff *skbs[32]; |
557 | dma_addr_t dmas[32]; | 557 | dma_addr_t dmas[32]; |
558 | 558 | ||
@@ -973,7 +973,7 @@ static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev) | |||
973 | struct pas_dma_xct_descr *dp; | 973 | struct pas_dma_xct_descr *dp; |
974 | u64 dflags, mactx, ptr; | 974 | u64 dflags, mactx, ptr; |
975 | dma_addr_t map; | 975 | dma_addr_t map; |
976 | int flags; | 976 | unsigned long flags; |
977 | 977 | ||
978 | dflags = XCT_MACTX_O | XCT_MACTX_ST | XCT_MACTX_SS | XCT_MACTX_CRC_PAD; | 978 | dflags = XCT_MACTX_O | XCT_MACTX_ST | XCT_MACTX_SS | XCT_MACTX_CRC_PAD; |
979 | 979 | ||