aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorMitch Williams <mitch.a.williams@intel.com>2005-11-09 10:36:11 -0800
committerJohn W. Linville <linville@tuxdriver.com>2005-11-13 14:48:20 -0500
commit3c535952d86df83f817595068c9fd2b3cfbd3a4d (patch)
tree39b7cc83918b32ad4a4487d20c94221a793c357f /drivers/net/bonding
parentdfe60397a62b1a5ebc7f05fd65463d3e29397677 (diff)
downloadkernel_samsung_smdk4412-3c535952d86df83f817595068c9fd2b3cfbd3a4d.tar.gz
kernel_samsung_smdk4412-3c535952d86df83f817595068c9fd2b3cfbd3a4d.tar.bz2
kernel_samsung_smdk4412-3c535952d86df83f817595068c9fd2b3cfbd3a4d.zip
[PATCH] bonding: make bond_init not __init
The sysfs interface can create bonds at runtime, and __init code goes away after module init. Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> Acked-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r--drivers/net/bonding/bond_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 2475b76e10e..73c9dd63e98 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4508,7 +4508,7 @@ static struct ethtool_ops bond_ethtool_ops = {
* Does not allocate but creates a /proc entry.
* Allowed to fail.
*/
-static int __init bond_init(struct net_device *bond_dev, struct bond_params *params)
+static int bond_init(struct net_device *bond_dev, struct bond_params *params)
{
struct bonding *bond = bond_dev->priv;