diff options
author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 20:11:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-05 14:04:41 -0400 |
commit | 1849f23d6ff57cf9d57741488adb14e0d7942406 (patch) | |
tree | 461a2ccc68cdd7217898a7cfc3f7c248501a4291 | |
parent | 6ca3b14a9b46af5a21c07844ddfa87d3d39db1b5 (diff) |
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>
-rw-r--r-- | drivers/char/mbcs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c index 47ff7e470d8..0c7d340b9ab 100644 --- a/drivers/char/mbcs.c +++ b/drivers/char/mbcs.c | |||
@@ -799,7 +799,7 @@ static int mbcs_remove(struct cx_dev *dev) | |||
799 | return 0; | 799 | return 0; |
800 | } | 800 | } |
801 | 801 | ||
802 | static const struct cx_device_id __devinitdata mbcs_id_table[] = { | 802 | static const struct cx_device_id __devinitconst mbcs_id_table[] = { |
803 | { | 803 | { |
804 | .part_num = MBCS_PART_NUM, | 804 | .part_num = MBCS_PART_NUM, |
805 | .mfg_num = MBCS_MFG_NUM, | 805 | .mfg_num = MBCS_MFG_NUM, |