Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 122100
b: refs/heads/master
c: 4ee2ac5
h: refs/heads/master
v: v3
  • Loading branch information
Brice Goglin authored and David S. Miller committed Nov 23, 2008
1 parent 5c5baa7 commit 88acf52
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: c1fd3b9455a977057f73534324d4e07a3d9fe502
refs/heads/master: 4ee2ac51359fc37d9ae5d5cc76e93af9105f1722
6 changes: 3 additions & 3 deletions trunk/drivers/net/myri10ge/myri10ge.c
Original file line number Diff line number Diff line change
Expand Up @@ -1024,7 +1024,7 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)
ss->dca_tag = NULL;
}
}
#endif /* CONFIG_DCA */
#endif /* CONFIG_MYRI10GE_DCA */

/* reset mcp/driver shared state back to 0 */

Expand Down Expand Up @@ -1121,7 +1121,7 @@ static int myri10ge_notify_dca_device(struct device *dev, void *data)
myri10ge_teardown_dca(mgp);
return 0;
}
#endif /* CONFIG_DCA */
#endif /* CONFIG_MYRI10GE_DCA */

static inline void
myri10ge_submit_8rx(struct mcp_kreq_ether_recv __iomem * dst,
Expand Down Expand Up @@ -4027,7 +4027,7 @@ static struct notifier_block myri10ge_dca_notifier = {
.next = NULL,
.priority = 0,
};
#endif /* CONFIG_DCA */
#endif /* CONFIG_MYRI10GE_DCA */

static __init int myri10ge_init_module(void)
{
Expand Down

0 comments on commit 88acf52

Please sign in to comment.