lkml.org 
[lkml]   [2012]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 28/31] sections: Fix section conflicts in net/can
    Date
    From: Andi Kleen <ak@linux.intel.com>

    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    ---
    net/can/af_can.c | 2 +-
    net/can/bcm.c | 2 +-
    net/can/gw.c | 2 +-
    net/can/raw.c | 2 +-
    4 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/net/can/af_can.c b/net/can/af_can.c
    index 821022a..ddac1ee 100644
    --- a/net/can/af_can.c
    +++ b/net/can/af_can.c
    @@ -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");
    diff --git a/net/can/bcm.c b/net/can/bcm.c
    index 151b773..6f74758 100644
    --- a/net/can/bcm.c
    +++ b/net/can/bcm.c
    @@ -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");
    diff --git a/net/can/gw.c b/net/can/gw.c
    index b54d5e6..4fe4fc4 100644
    --- a/net/can/gw.c
    +++ b/net/can/gw.c
    @@ -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");
    diff --git a/net/can/raw.c b/net/can/raw.c
    index 3e9c893..5b0e3e3 100644
    --- a/net/can/raw.c
    +++ b/net/can/raw.c
    @@ -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");
    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-08-18 20:01    [W:4.160 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site