]> Pileus Git - ~andy/linux/commitdiff
sections: fix section conflicts in drivers/char
authorAndi Kleen <ak@linux.intel.com>
Fri, 5 Oct 2012 00:11:47 +0000 (17:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Oct 2012 18:04:41 +0000 (03:04 +0900)
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>
drivers/char/mbcs.c

index 47ff7e470d87dc15cd0f8ba558b00c1e45e5ecbc..0c7d340b9ab9b69aa6b977d97afe2587743f2e61 100644 (file)
@@ -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,