aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2008-11-01 18:20:19 +0000
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-01 12:40:38 -0700
commit37b2a1791c8b8d630944afbe0745a08c8e8ae091 (patch)
treec001e5ea571b35d1016fe000eddedcb36aa72093
parent9ca68233f2ec12efc950b4d15e9a761308da2b3e (diff)
downloadkernel_samsung_aries-37b2a1791c8b8d630944afbe0745a08c8e8ae091.zip
kernel_samsung_aries-37b2a1791c8b8d630944afbe0745a08c8e8ae091.tar.gz
kernel_samsung_aries-37b2a1791c8b8d630944afbe0745a08c8e8ae091.tar.bz2
el3_common_init() should be __devinit, not __init
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/net/3c509.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index 3a7bc52..c7a4f3b 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -94,7 +94,7 @@
#include <asm/io.h>
#include <asm/irq.h>
-static char version[] __initdata = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n";
+static char version[] __devinitdata = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n";
#ifdef EL3_DEBUG
static int el3_debug = EL3_DEBUG;
@@ -186,7 +186,7 @@ static int max_interrupt_work = 10;
static int nopnp;
#endif
-static int __init el3_common_init(struct net_device *dev);
+static int __devinit el3_common_init(struct net_device *dev);
static void el3_common_remove(struct net_device *dev);
static ushort id_read_eeprom(int index);
static ushort read_eeprom(int ioaddr, int index);
@@ -537,7 +537,7 @@ static struct mca_driver el3_mca_driver = {
static int mca_registered;
#endif /* CONFIG_MCA */
-static int __init el3_common_init(struct net_device *dev)
+static int __devinit el3_common_init(struct net_device *dev)
{
struct el3_private *lp = netdev_priv(dev);
int err;