Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sections: fix section conflicts in drivers/video

Browse source 
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>
This commit is contained in:
Andi Kleen 2012-10-04 17:12:05 -07:00 committed by Linus Torvalds
parent 16bd9b8782
commit 556f00ede8
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/video/aty/aty128fb.c
View file

@ -149,7 +149,7 @@ enum {
}; };
/* Must match above enum */ /* Must match above enum */
static const char *r128_family[] __devinitdata = { static char * const r128_family[] __devinitconst = {
"AGP", "AGP",
"PCI", "PCI",
"PRO AGP", "PRO AGP",

2
drivers/video/geode/gx1fb_core.c
View file

@ -29,7 +29,7 @@ static int crt_option = 1;
static char panel_option[32] = ""; static char panel_option[32] = "";
/* Modes relevant to the GX1 (taken from modedb.c) */ /* Modes relevant to the GX1 (taken from modedb.c) */
static const struct fb_videomode __devinitdata gx1_modedb[] = { static const struct fb_videomode __devinitconst gx1_modedb[] = {
/* 640x480-60 VESA */ /* 640x480-60 VESA */
{ NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2, { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },

4
drivers/video/gxt4500.c
View file

@ -156,7 +156,7 @@ struct gxt4500_par {
static char *mode_option; static char *mode_option;
/* default mode: 1280x1024 @ 60 Hz, 8 bpp */ /* default mode: 1280x1024 @ 60 Hz, 8 bpp */
static const struct fb_videomode defaultmode __devinitdata = { static const struct fb_videomode defaultmode __devinitconst = {
.refresh = 60, .refresh = 60,
.xres = 1280, .xres = 1280,
.yres = 1024, .yres = 1024,
@ -581,7 +581,7 @@ static int gxt4500_blank(int blank, struct fb_info *info)
return 0; return 0;
} }
static const struct fb_fix_screeninfo gxt4500_fix __devinitdata = { static const struct fb_fix_screeninfo gxt4500_fix __devinitconst = {
.id = "IBM GXT4500P", .id = "IBM GXT4500P",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_PSEUDOCOLOR, .visual = FB_VISUAL_PSEUDOCOLOR,

2
drivers/video/i810/i810_main.c
View file

@ -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); static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par);
/* PCI */ /* PCI */
static const char *i810_pci_list[] __devinitdata = { static const char * const i810_pci_list[] __devinitconst = {
"Intel(R) 810 Framebuffer Device" , "Intel(R) 810 Framebuffer Device" ,
"Intel(R) 810-DC100 Framebuffer Device" , "Intel(R) 810-DC100 Framebuffer Device" ,
"Intel(R) 810E Framebuffer Device" , "Intel(R) 810E Framebuffer Device" ,

2
drivers/video/jz4740_fb.c
View file

@ -136,7 +136,7 @@ struct jzfb {
uint32_t pseudo_palette[16]; uint32_t pseudo_palette[16];
}; };
static const struct fb_fix_screeninfo jzfb_fix __devinitdata = { static const struct fb_fix_screeninfo jzfb_fix __devinitconst = {
.id = "JZ4740 FB", .id = "JZ4740 FB",
.type = FB_TYPE_PACKED_PIXELS, .type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_TRUECOLOR, .visual = FB_VISUAL_TRUECOLOR,