diff options
| author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 20:12:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-05 14:04:44 -0400 |
| commit | 556f00ede819c20eaf2af9017a78c713b33ca4e7 (patch) | |
| tree | cb8b6c46d65c79f8e9b5ce258daff626324e79c0 /drivers/video/jz4740_fb.c | |
| parent | 16bd9b8782db45de1082c51967b4a348ceac1d42 (diff) | |
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/jz4740_fb.c')
| -rw-r--r-- | drivers/video/jz4740_fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/jz4740_fb.c b/drivers/video/jz4740_fb.c index de366937c933..3c63fc24bb1f 100644 --- a/drivers/video/jz4740_fb.c +++ b/drivers/video/jz4740_fb.c | |||
| @@ -136,7 +136,7 @@ struct jzfb { | |||
| 136 | uint32_t pseudo_palette[16]; | 136 | uint32_t pseudo_palette[16]; |
| 137 | }; | 137 | }; |
| 138 | 138 | ||
| 139 | static const struct fb_fix_screeninfo jzfb_fix __devinitdata = { | 139 | static const struct fb_fix_screeninfo jzfb_fix __devinitconst = { |
| 140 | .id = "JZ4740 FB", | 140 | .id = "JZ4740 FB", |
| 141 | .type = FB_TYPE_PACKED_PIXELS, | 141 | .type = FB_TYPE_PACKED_PIXELS, |
| 142 | .visual = FB_VISUAL_TRUECOLOR, | 142 | .visual = FB_VISUAL_TRUECOLOR, |