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

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

sections: fix section conflicts in net/can 



Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: Oliver Hartkopp <socketcan@hartkopp.net>
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 17f3609c

net/can/af_can.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 


#include "af_can.h"



static __initdata const char banner[] = KERN_INFO

static __initconst const char banner[] = KERN_INFO

	"can: controller area network core (" CAN_VERSION_STRING ")\n";



MODULE_DESCRIPTION("Controller Area Network PF_CAN core");

net/can/bcm.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
		     (CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG))



#define CAN_BCM_VERSION CAN_VERSION

static __initdata const char banner[] = KERN_INFO

static __initconst const char banner[] = KERN_INFO

	"can: broadcast manager protocol (rev " CAN_BCM_VERSION " t)\n";



MODULE_DESCRIPTION("PF_CAN broadcast manager protocol");

net/can/gw.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
#include <net/sock.h>



#define CAN_GW_VERSION "20101209"

static __initdata const char banner[] =

static __initconst const char banner[] =

	KERN_INFO "can: netlink gateway (rev " CAN_GW_VERSION ")\n";



MODULE_DESCRIPTION("PF_CAN netlink gateway");

net/can/raw.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
#include <net/net_namespace.h>



#define CAN_RAW_VERSION CAN_VERSION

static __initdata const char banner[] =

static __initconst const char banner[] =

	KERN_INFO "can: raw protocol (rev " CAN_RAW_VERSION ")\n";



MODULE_DESCRIPTION("PF_CAN raw protocol");