Commit a13925a4 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by David S. Miller
Browse files

net: cris: make eth_v10.c explicitly non-modular

The Makefile/Kconfig currently controlling compilation of this code is:

drivers/net/cris/Makefile:obj-$(CONFIG_ETRAX_ARCH_V10) += eth_v10.o

arch/cris/Kconfig:config ETRAX_ARCH_V10
arch/cris/Kconfig:       bool

...meaning that it currently is not being built as a module by anyone.

Lets remove the couple traces of modular infrastructure use, so that
when reading the driver there is no doubt it is builtin-only.

Since module_init translates to device_initcall in the non-modular
case, the init ordering remains unchanged with this commit.

There was a one line wrapper for the int init function, which made no
sense; hence we just put the device_initcall on the true init function
itself and delete the pointless wrapper.  In doing that we get rid of
the following compile warning:

   WARNING: drivers/net/built-in.o(.text+0x1e28): Section mismatch in
   reference from the function etrax_init_module() to the function

We don't replace module.h with init.h since the file already has that.

Cc: "David S. Miller" <>
Cc: Mikael Starvik <>
Cc: Jesper Nilsson <>
Signed-off-by: default avatarPaul Gortmaker <>
Signed-off-by: default avatarDavid S. Miller <>
parent 17a032b7
......@@ -7,9 +7,6 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/delay.h>
#include <linux/types.h>
......@@ -411,6 +408,7 @@ etrax_ethernet_init(void)
led_next_time = jiffies;
return 0;
/* set MAC address of the interface. called from the core after a
* SIOCSIFADDR ioctl, and from the bootup above.
......@@ -1714,11 +1712,6 @@ e100_netpoll(struct net_device* netdev)
static int
return etrax_ethernet_init();
static int __init
e100_boot_setup(char* str)
......@@ -1741,5 +1734,3 @@ e100_boot_setup(char* str)
__setup("etrax100_eth=", e100_boot_setup);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment