Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c477ebd8 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

sections: fix section conflicts in drivers/net 



Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6cfe1093

drivers/net/can/slcan.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -56,7 +56,7 @@ 
#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/can.h>

#include <linux/can.h>





static __initdata const char banner[] =

static __initconst const char banner[] =

	KERN_INFO "slcan: serial line CAN interface driver\n";

	KERN_INFO "slcan: serial line CAN interface driver\n";





MODULE_ALIAS_LDISC(N_SLCAN);

MODULE_ALIAS_LDISC(N_SLCAN);

drivers/net/can/vcan.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ 
#include <linux/slab.h>

#include <linux/slab.h>

#include <net/rtnetlink.h>

#include <net/rtnetlink.h>





static __initdata const char banner[] =

static __initconst const char banner[] =

	KERN_INFO "vcan: Virtual CAN interface driver\n";

	KERN_INFO "vcan: Virtual CAN interface driver\n";





MODULE_DESCRIPTION("virtual CAN interface");

MODULE_DESCRIPTION("virtual CAN interface");

drivers/net/ethernet/8390/ne3210.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -81,7 +81,7 @@ static void ne3210_block_output(struct net_device *dev, int count, const unsigne 




static unsigned char irq_map[] __initdata = {15, 12, 11, 10, 9, 7, 5, 3};

static unsigned char irq_map[] __initdata = {15, 12, 11, 10, 9, 7, 5, 3};

static unsigned int shmem_map[] __initdata = {0xff0, 0xfe0, 0xfff0, 0xd8, 0xffe0, 0xffc0, 0xd0, 0x0};

static unsigned int shmem_map[] __initdata = {0xff0, 0xfe0, 0xfff0, 0xd8, 0xffe0, 0xffc0, 0xd0, 0x0};

static const char *ifmap[] __initdata = {"UTP", "?", "BNC", "AUI"};

static const char * const ifmap[] __initconst = {"UTP", "?", "BNC", "AUI"};

static int ifmap_val[] __initdata = {

static int ifmap_val[] __initdata = {

		IF_PORT_10BASET,

		IF_PORT_10BASET,

		IF_PORT_UNKNOWN,

		IF_PORT_UNKNOWN,

drivers/net/ethernet/adaptec/starfire.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -295,7 +295,7 @@ MODULE_DEVICE_TABLE(pci, starfire_pci_tbl); 
static const struct chip_info {

static const struct chip_info {

	const char *name;

	const char *name;

	int drv_flags;

	int drv_flags;

} netdrv_tbl[] __devinitdata = {

} netdrv_tbl[] __devinitconst = {

	{ "Adaptec Starfire 6915", CanHaveMII },

	{ "Adaptec Starfire 6915", CanHaveMII },

};

};

drivers/net/ethernet/atheros/atl1c/atl1c_main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -702,7 +702,7 @@ struct atl1c_platform_patch { 
	u32 patch_flag;

	u32 patch_flag;

#define ATL1C_LINK_PATCH	0x1

#define ATL1C_LINK_PATCH	0x1

};

};

static const struct atl1c_platform_patch plats[] __devinitdata = {

static const struct atl1c_platform_patch plats[] __devinitconst = {

{0x2060, 0xC1, 0x1019, 0x8152, 0x1},

{0x2060, 0xC1, 0x1019, 0x8152, 0x1},

{0x2060, 0xC1, 0x1019, 0x2060, 0x1},

{0x2060, 0xC1, 0x1019, 0x2060, 0x1},

{0x2060, 0xC1, 0x1019, 0xE000, 0x1},

{0x2060, 0xC1, 0x1019, 0xE000, 0x1},