Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 203199
b: refs/heads/master
c: d30b181
h: refs/heads/master
i:
  203197: dba96da
  203195: 414b7d5
  203191: 3b0f563
  203183: a001139
  203167: 70a88e9
  203135: 48ba545
v: v3
  • Loading branch information
David Daney authored and David S. Miller committed Jun 29, 2010
1 parent 93e7863 commit b69169f
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: 210d6de78c5d7c785fc532556cea340e517955e1
refs/heads/master: d30b181bd6d047b39235a0d8e26de422d9d05b25
6 changes: 3 additions & 3 deletions trunk/drivers/net/octeon/octeon_mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -1067,7 +1067,7 @@ static const struct net_device_ops octeon_mgmt_ops = {
#endif
};

static int __init octeon_mgmt_probe(struct platform_device *pdev)
static int __devinit octeon_mgmt_probe(struct platform_device *pdev)
{
struct resource *res_irq;
struct net_device *netdev;
Expand Down Expand Up @@ -1124,7 +1124,7 @@ static int __init octeon_mgmt_probe(struct platform_device *pdev)
return -ENOENT;
}

static int __exit octeon_mgmt_remove(struct platform_device *pdev)
static int __devexit octeon_mgmt_remove(struct platform_device *pdev)
{
struct net_device *netdev = dev_get_drvdata(&pdev->dev);

Expand All @@ -1139,7 +1139,7 @@ static struct platform_driver octeon_mgmt_driver = {
.owner = THIS_MODULE,
},
.probe = octeon_mgmt_probe,
.remove = __exit_p(octeon_mgmt_remove),
.remove = __devexit_p(octeon_mgmt_remove),
};

extern void octeon_mdiobus_force_mod_depencency(void);
Expand Down

0 comments on commit b69169f

Please sign in to comment.