summaryrefslogtreecommitdiffstats
path: root/drivers/video/aty
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/aty
parent16bd9b8782db45de1082c51967b4a348ceac1d42 (diff)
downloadop-kernel-dev-556f00ede819c20eaf2af9017a78c713b33ca4e7.zip
op-kernel-dev-556f00ede819c20eaf2af9017a78c713b33ca4e7.tar.gz
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/aty')
-rw-r--r--drivers/video/aty/aty128fb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 747442d..0fefa84 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -149,7 +149,7 @@ enum {
};
/* Must match above enum */
-static const char *r128_family[] __devinitdata = {
+static char * const r128_family[] __devinitconst = {
"AGP",
"PCI",
"PRO AGP",
OpenPOWER on IntegriCloud