Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 44182
b: refs/heads/master
c: 6250223
h: refs/heads/master
v: v3
  • Loading branch information
Brice Goglin authored and Jeff Garzik committed Dec 11, 2006
1 parent 7da6c29 commit 04e3649
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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: 7fe26a60e08f38c797851fb3b444d753af616112
refs/heads/master: 6250223e055764efcaef3809a9f2350edfc82bbc
8 changes: 4 additions & 4 deletions trunk/drivers/net/myri10ge/myri10ge.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,9 @@ MODULE_PARM_DESC(myri10ge_debug, "Debug level (0=none,...,16=all)");

#define myri10ge_pio_copy(to,from,size) __iowrite64_copy(to,from,size/8)

static inline void put_be32(__be32 val, __be32 __iomem *p)
static inline void put_be32(__be32 val, __be32 __iomem * p)
{
__raw_writel((__force __u32)val, (__force void __iomem *)p);
__raw_writel((__force __u32) val, (__force void __iomem *)p);
}

static int
Expand Down Expand Up @@ -2206,7 +2206,7 @@ static void myri10ge_set_multicast_list(struct net_device *dev)
struct myri10ge_cmd cmd;
struct myri10ge_priv *mgp;
struct dev_mc_list *mc_list;
__be32 data[2] = {0, 0};
__be32 data[2] = { 0, 0 };
int err;

mgp = netdev_priv(dev);
Expand Down Expand Up @@ -2625,7 +2625,7 @@ static u32 myri10ge_read_reboot(struct myri10ge_priv *mgp)
static void myri10ge_watchdog(struct work_struct *work)
{
struct myri10ge_priv *mgp =
container_of(work, struct myri10ge_priv, watchdog_work);
container_of(work, struct myri10ge_priv, watchdog_work);
u32 reboot;
int status;
u16 cmd, vendor;
Expand Down

0 comments on commit 04e3649

Please sign in to comment.