]> git.baikalelectronics.ru Git - kernel.git/commit
drivers: Remove inclusion of vermagic header
authorLeon Romanovsky <leonro@mellanox.com>
Sun, 19 Apr 2020 14:18:47 +0000 (17:18 +0300)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Apr 2020 20:27:37 +0000 (13:27 -0700)
commit1c25827f5f34eb477d9a8dea883bec43bf066a23
tree67f7039fc88ebe8d0e1b52119b2e4959fbba2e49
parent78ac31fe9445d903e4d66afdc151d5f27039d8a2
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: 109fc82df1f7 ("net/3com: Delete driver and module versions from 3com drivers")
Co-developed-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Shannon Nelson <snelson@pensando.io> # ionic
Acked-by: Sebastian Reichel <sre@kernel.org> # power
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bonding_priv.h
drivers/net/ethernet/3com/3c509.c
drivers/net/ethernet/3com/3c515.c
drivers/net/ethernet/adaptec/starfire.c
drivers/net/ethernet/pensando/ionic/ionic_main.c
drivers/power/supply/test_power.c
net/ethtool/ioctl.c