Resolved conflicts axi_ethernet: Remove section mismatch

Warning log:
MODPOST vmlinux.o
WARNING: vmlinux.o(.data+0xb078): Section mismatch in reference
from the variable axienet_of_driver to the function
.init.text:axienet_probe()
The variable axienet_of_driver references
the function __init axienet_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: Michal Simek <monstr@monstr.eu>
Conflicts:

	drivers/net/xilinx_axienet_main.c

diff --git a/drivers/net/xilinx_axienet_main.c b/drivers/net/xilinx_axienet_main.c
index 25e667d8c10aab41782e5d6aceeb3c63d0d0e008..f53977aa8333e4b1f57636719145d2688e05b8f9 100644 (file)
--- a/drivers/net/xilinx_axienet_main.c
+++ b/drivers/net/xilinx_axienet_main.c
@@ -1777,8 +1777,8 @@ static void axienet_dma_err_handler(unsigned long data)
  * device. Parses through device tree and populates fields of
  * axienet_local. It registers the Ethernet device.
  **/
-static int __init
-axienet_of_probe(struct platform_device *op, const struct of_device_id *match)
+static int __devinit
+axienet_of_probe(struct platform_device *op)
 {
        struct device_node *np;
        struct axienet_local *lp;