Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 66832
b: refs/heads/master
c: ca7e235
h: refs/heads/master
v: v3
  • Loading branch information
Olof Johansson authored and David S. Miller committed Oct 10, 2007
1 parent 76cde67 commit 8ea5c3b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6a290e3d5d48e8932fae068a558b3d8dff4c7acf
refs/heads/master: ca7e235f5eb960d83b45cef4384b490672538cd9
4 changes: 2 additions & 2 deletions trunk/drivers/net/pasemi_mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ static int pasemi_mac_clean_tx(struct pasemi_mac *mac)
struct pas_dma_xct_descr *dp;
unsigned int start, count, limit;
unsigned int total_count;
int flags;
unsigned long flags;
struct sk_buff *skbs[32];
dma_addr_t dmas[32];

Expand Down Expand Up @@ -973,7 +973,7 @@ static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev)
struct pas_dma_xct_descr *dp;
u64 dflags, mactx, ptr;
dma_addr_t map;
int flags;
unsigned long flags;

dflags = XCT_MACTX_O | XCT_MACTX_ST | XCT_MACTX_SS | XCT_MACTX_CRC_PAD;

Expand Down

0 comments on commit 8ea5c3b

Please sign in to comment.