diff --git a/[refs] b/[refs] index a25b146c3476..c5e4adee9f37 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1cf8422f0512c2b14f0d66bce34abb0645c888a +refs/heads/master: 5747a1aacde268017784a6a56df06c3b40194381 diff --git a/trunk/net/ipv4/ipip.c b/trunk/net/ipv4/ipip.c index 5079dfbc6f38..c49c4ecfb154 100644 --- a/trunk/net/ipv4/ipip.c +++ b/trunk/net/ipv4/ipip.c @@ -750,7 +750,7 @@ static struct xfrm_tunnel ipip_handler = { .priority = 1, }; -static char banner[] __initdata = +static const char banner[] __initconst = KERN_INFO "IPv4 over IPv4 tunneling driver\n"; static void ipip_destroy_tunnels(struct ipip_net *ipn)