diff options
author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 17:12:05 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-06 03:04:44 +0900 |
commit | 556f00ede819c20eaf2af9017a78c713b33ca4e7 (patch) | |
tree | cb8b6c46d65c79f8e9b5ce258daff626324e79c0 /drivers/video/i810 | |
parent | 16bd9b8782db45de1082c51967b4a348ceac1d42 (diff) | |
download | linux-556f00ede819c20eaf2af9017a78c713b33ca4e7.tar.gz linux-556f00ede819c20eaf2af9017a78c713b33ca4e7.tar.bz2 linux-556f00ede819c20eaf2af9017a78c713b33ca4e7.zip |
sections: fix section conflicts in drivers/video
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/i810')
-rw-r--r-- | drivers/video/i810/i810_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c index b83f36190cae..5c067816a81d 100644 --- a/drivers/video/i810/i810_main.c +++ b/drivers/video/i810/i810_main.c @@ -97,7 +97,7 @@ static int i810fb_blank (int blank_mode, struct fb_info *info); static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par); /* PCI */ -static const char *i810_pci_list[] __devinitdata = { +static const char * const i810_pci_list[] __devinitconst = { "Intel(R) 810 Framebuffer Device" , "Intel(R) 810-DC100 Framebuffer Device" , "Intel(R) 810E Framebuffer Device" , |