summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2007-09-26 16:23:59 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:53:43 -0700
commitca7e235f5eb960d83b45cef4384b490672538cd9 (patch)
tree553c3eafb692ceb2f7dab8a38b90a54878ffcb63 /drivers
parent6a290e3d5d48e8932fae068a558b3d8dff4c7acf (diff)
downloadlinux-3.10-ca7e235f5eb960d83b45cef4384b490672538cd9.tar.gz
linux-3.10-ca7e235f5eb960d83b45cef4384b490672538cd9.tar.bz2
linux-3.10-ca7e235f5eb960d83b45cef4384b490672538cd9.zip
pasemi_mac: flags as passed to spin_*_irqsave() should be unsigned long
pasemi_mac: flags as passed to spin_*_irqsave() should be unsigned long. Signed-off-by: Tony Breeds <tony@bakeyournoodle.com> Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/pasemi_mac.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index daba11062d3..8892b658655 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)
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];
@@ -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;