summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2012-10-04 17:11:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-06 03:04:41 +0900
commit1849f23d6ff57cf9d57741488adb14e0d7942406 (patch)
tree461a2ccc68cdd7217898a7cfc3f7c248501a4291 /drivers/char
parent6ca3b14a9b46af5a21c07844ddfa87d3d39db1b5 (diff)
downloadlinux-stable-1849f23d6ff57cf9d57741488adb14e0d7942406.tar.gz
linux-stable-1849f23d6ff57cf9d57741488adb14e0d7942406.tar.bz2
linux-stable-1849f23d6ff57cf9d57741488adb14e0d7942406.zip
sections: fix section conflicts in drivers/char
Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/mbcs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
index 47ff7e470d87..0c7d340b9ab9 100644
--- a/drivers/char/mbcs.c
+++ b/drivers/char/mbcs.c
@@ -799,7 +799,7 @@ static int mbcs_remove(struct cx_dev *dev)
return 0;
}
-static const struct cx_device_id __devinitdata mbcs_id_table[] = {
+static const struct cx_device_id __devinitconst mbcs_id_table[] = {
{
.part_num = MBCS_PART_NUM,
.mfg_num = MBCS_MFG_NUM,