diff --git a/[refs] b/[refs] index f14bde98d640..5c559d92600c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e879b7f34e18cd886754069e988587a5618c73f0 +refs/heads/master: f9d1ae81dc9abfa7e6a2128989cca35a9bdea57b diff --git a/trunk/drivers/media/video/s5p-tv/mixer_drv.c b/trunk/drivers/media/video/s5p-tv/mixer_drv.c index a2c0c25ad130..edca06592883 100644 --- a/trunk/drivers/media/video/s5p-tv/mixer_drv.c +++ b/trunk/drivers/media/video/s5p-tv/mixer_drv.c @@ -461,7 +461,7 @@ static struct platform_driver mxr_driver __refdata = { static int __init mxr_init(void) { int i, ret; - static const char banner[] __initdata = KERN_INFO + static const char banner[] __initconst = KERN_INFO "Samsung TV Mixer driver, " "(c) 2010-2011 Samsung Electronics Co., Ltd.\n"; printk(banner);