diff options
author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 20:12:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-05 14:04:44 -0400 |
commit | 556f00ede819c20eaf2af9017a78c713b33ca4e7 (patch) | |
tree | cb8b6c46d65c79f8e9b5ce258daff626324e79c0 /drivers/video/gxt4500.c | |
parent | 16bd9b8782db45de1082c51967b4a348ceac1d42 (diff) |
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/gxt4500.c')
-rw-r--r-- | drivers/video/gxt4500.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c index 0fad23f810a..0e9afa41d16 100644 --- a/drivers/video/gxt4500.c +++ b/drivers/video/gxt4500.c | |||
@@ -156,7 +156,7 @@ struct gxt4500_par { | |||
156 | static char *mode_option; | 156 | static char *mode_option; |
157 | 157 | ||
158 | /* default mode: 1280x1024 @ 60 Hz, 8 bpp */ | 158 | /* default mode: 1280x1024 @ 60 Hz, 8 bpp */ |
159 | static const struct fb_videomode defaultmode __devinitdata = { | 159 | static const struct fb_videomode defaultmode __devinitconst = { |
160 | .refresh = 60, | 160 | .refresh = 60, |
161 | .xres = 1280, | 161 | .xres = 1280, |
162 | .yres = 1024, | 162 | .yres = 1024, |
@@ -581,7 +581,7 @@ static int gxt4500_blank(int blank, struct fb_info *info) | |||
581 | return 0; | 581 | return 0; |
582 | } | 582 | } |
583 | 583 | ||
584 | static const struct fb_fix_screeninfo gxt4500_fix __devinitdata = { | 584 | static const struct fb_fix_screeninfo gxt4500_fix __devinitconst = { |
585 | .id = "IBM GXT4500P", | 585 | .id = "IBM GXT4500P", |
586 | .type = FB_TYPE_PACKED_PIXELS, | 586 | .type = FB_TYPE_PACKED_PIXELS, |
587 | .visual = FB_VISUAL_PSEUDOCOLOR, | 587 | .visual = FB_VISUAL_PSEUDOCOLOR, |