summaryrefslogtreecommitdiffstats
path: root/drivers/video/geode
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2012-10-04 17:12:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-06 03:04:44 +0900
commit556f00ede819c20eaf2af9017a78c713b33ca4e7 (patch)
treecb8b6c46d65c79f8e9b5ce258daff626324e79c0 /drivers/video/geode
parent16bd9b8782db45de1082c51967b4a348ceac1d42 (diff)
downloadlinux-stable-556f00ede819c20eaf2af9017a78c713b33ca4e7.tar.gz
linux-stable-556f00ede819c20eaf2af9017a78c713b33ca4e7.tar.bz2
linux-stable-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/geode')
-rw-r--r--drivers/video/geode/gx1fb_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
index 5a5d0928df33..265c5ed59ade 100644
--- a/drivers/video/geode/gx1fb_core.c
+++ b/drivers/video/geode/gx1fb_core.c
@@ -29,7 +29,7 @@ static int crt_option = 1;
static char panel_option[32] = "";
/* 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 */
{ NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },