summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-05-06 08:14:57 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-06 08:14:57 +0100
commit56f3aeb2c14b9d000dfc77f352250bc3b67af5c0 (patch)
tree6e0ab3d79da15087df628809ef97c48713eb6aca
parent5895198c56d131cc696556a45f7ff0ea99ac297b (diff)
downloadblackbird-op-linux-56f3aeb2c14b9d000dfc77f352250bc3b67af5c0.tar.gz
blackbird-op-linux-56f3aeb2c14b9d000dfc77f352250bc3b67af5c0.zip
ARM: RiscPC: etherh: fix section mismatches
WARNING: drivers/net/arm/built-in.o(.data+0x0): Section mismatch in reference from the variable etherh_driver to the function .init.text:etherh_probe() The variable etherh_driver references the function __init etherh_probe() If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/net/arm/etherh.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c
index 4af235d41fda..fbfb5b47c506 100644
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
@@ -527,7 +527,7 @@ static void __init etherh_banner(void)
* Read the ethernet address string from the on board rom.
* This is an ascii string...
*/
-static int __init etherh_addr(char *addr, struct expansion_card *ec)
+static int __devinit etherh_addr(char *addr, struct expansion_card *ec)
{
struct in_chunk_dir cd;
char *s;
@@ -655,7 +655,7 @@ static const struct net_device_ops etherh_netdev_ops = {
static u32 etherh_regoffsets[16];
static u32 etherm_regoffsets[16];
-static int __init
+static int __devinit
etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
{
const struct etherh_data *data = id->data;
OpenPOWER on IntegriCloud