diff --git a/[refs] b/[refs] index 4cca648ecfe2..b3912e459df9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b209639e8a91aaabedf8bf3716710e6d9ae942e3 +refs/heads/master: 1b0b04f9fb657a9ee85e3b9388394b9b943f7ffc diff --git a/trunk/net/ipv4/ipconfig.c b/trunk/net/ipv4/ipconfig.c index 6422422b8e3d..4bc3a57c183d 100644 --- a/trunk/net/ipv4/ipconfig.c +++ b/trunk/net/ipv4/ipconfig.c @@ -140,7 +140,8 @@ __be32 ic_servaddr = NONE; /* Boot server IP address */ __be32 root_server_addr = NONE; /* Address of NFS server */ u8 root_server_path[256] = { 0, }; /* Path to mount as root */ -static char vendor_class_identifier[253]; /* vendor class identifier */ +/* vendor class identifier */ +static char vendor_class_identifier[253] __initdata; /* Persistent data: */