From b69169f8cc400d886b88046ea771e447cc38841a Mon Sep 17 00:00:00 2001 From: David Daney Date: Thu, 24 Jun 2010 09:14:47 +0000 Subject: [PATCH] --- yaml --- r: 203199 b: refs/heads/master c: d30b181bd6d047b39235a0d8e26de422d9d05b25 h: refs/heads/master i: 203197: dba96da4ac99f317e08ce3e656d5d97b332eb3c5 203195: 414b7d5d65c20ca1f075e45b759b69bed0e15247 203191: 3b0f56306eaa4bbd41954c23273cd0f4189adf6f 203183: a00113980fed8f222fa00d0e0facd549f418ef18 203167: 70a88e9f52e43da9dd65d8e7f05d69feb8d29407 203135: 48ba54577c09fbf8acdcf07529a90b48fa400505 v: v3 --- [refs] | 2 +- trunk/drivers/net/octeon/octeon_mgmt.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b905475afc88..d55b96778fa9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 210d6de78c5d7c785fc532556cea340e517955e1 +refs/heads/master: d30b181bd6d047b39235a0d8e26de422d9d05b25 diff --git a/trunk/drivers/net/octeon/octeon_mgmt.c b/trunk/drivers/net/octeon/octeon_mgmt.c index 000e792d57c0..f4a0f08e14e1 100644 --- a/trunk/drivers/net/octeon/octeon_mgmt.c +++ b/trunk/drivers/net/octeon/octeon_mgmt.c @@ -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; @@ -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); @@ -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);