Commit 1c79031f authored by Leon Romanovsky's avatar Leon Romanovsky Committed by David S. Miller

drivers: Remove inclusion of vermagic header

Get rid of linux/vermagic.h includes, so that MODULE_ARCH_VERMAGIC from
the arch header arch/x86/include/asm/module.h won't be redefined.

  In file included from ./include/linux/module.h:30,
                   from drivers/net/ethernet/3com/3c515.c:56:
  ./arch/x86/include/asm/module.h:73: warning: "MODULE_ARCH_VERMAGIC"
redefined
     73 | # define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
        |
  In file included from drivers/net/ethernet/3com/3c515.c:25:
  ./include/linux/vermagic.h:28: note: this is the location of the
previous definition
     28 | #define MODULE_ARCH_VERMAGIC ""
        |

Fixes: 6bba2e89 ("net/3com: Delete driver and module versions from 3com drivers")
Co-developed-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: Shannon Nelson <snelson@pensando.io> # ionic
Acked-by: Sebastian Reichel <sre@kernel.org> # power
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b6246f4d
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#ifndef _BONDING_PRIV_H #ifndef _BONDING_PRIV_H
#define _BONDING_PRIV_H #define _BONDING_PRIV_H
#include <linux/vermagic.h> #include <generated/utsrelease.h>
#define DRV_NAME "bonding" #define DRV_NAME "bonding"
#define DRV_DESCRIPTION "Ethernet Channel Bonding Driver" #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
......
...@@ -85,7 +85,6 @@ ...@@ -85,7 +85,6 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/eisa.h> #include <linux/eisa.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/vermagic.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
*/ */
#include <linux/vermagic.h>
#define DRV_NAME "3c515" #define DRV_NAME "3c515"
#define CORKSCREW 1 #define CORKSCREW 1
......
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include <asm/processor.h> /* Processor type for cache alignment. */ #include <asm/processor.h> /* Processor type for cache alignment. */
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
#include <linux/vermagic.h>
/* /*
* The current frame processor firmware fails to checksum a fragment * The current frame processor firmware fails to checksum a fragment
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/utsname.h> #include <linux/utsname.h>
#include <linux/vermagic.h> #include <generated/utsrelease.h>
#include "ionic.h" #include "ionic.h"
#include "ionic_bus.h" #include "ionic_bus.h"
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <linux/power_supply.h> #include <linux/power_supply.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/vermagic.h> #include <generated/utsrelease.h>
enum test_power_id { enum test_power_id {
TEST_AC, TEST_AC,
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/vermagic.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/sfp.h> #include <linux/sfp.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -28,7 +27,7 @@ ...@@ -28,7 +27,7 @@
#include <net/xdp_sock.h> #include <net/xdp_sock.h>
#include <net/flow_offload.h> #include <net/flow_offload.h>
#include <linux/ethtool_netlink.h> #include <linux/ethtool_netlink.h>
#include <generated/utsrelease.h>
#include "common.h" #include "common.h"
/* /*
......
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