diff options
author | LABBE Corentin <clabbe.montjoie@gmail.com> | 2015-11-05 04:39:00 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-08 17:57:30 -0500 |
commit | a116eaf1be4ed4f91cc85d17b2f000f08d85c2d9 (patch) | |
tree | c02390e032a328f20cb6b9f696bdaf17269b8788 /drivers/char | |
parent | 987a9f128b8ad8e7019229300e8d91d37ca55933 (diff) |
char/nvram: set array of const as const
Some array of const char are not set as const.
This patch fix that.
Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/nvram.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c index 01292328a456..678fa97e41fb 100644 --- a/drivers/char/nvram.c +++ b/drivers/char/nvram.c | |||
@@ -496,12 +496,12 @@ static void pc_set_checksum(void) | |||
496 | 496 | ||
497 | #ifdef CONFIG_PROC_FS | 497 | #ifdef CONFIG_PROC_FS |
498 | 498 | ||
499 | static char *floppy_types[] = { | 499 | static const char * const floppy_types[] = { |
500 | "none", "5.25'' 360k", "5.25'' 1.2M", "3.5'' 720k", "3.5'' 1.44M", | 500 | "none", "5.25'' 360k", "5.25'' 1.2M", "3.5'' 720k", "3.5'' 1.44M", |
501 | "3.5'' 2.88M", "3.5'' 2.88M" | 501 | "3.5'' 2.88M", "3.5'' 2.88M" |
502 | }; | 502 | }; |
503 | 503 | ||
504 | static char *gfx_types[] = { | 504 | static const char * const gfx_types[] = { |
505 | "EGA, VGA, ... (with BIOS)", | 505 | "EGA, VGA, ... (with BIOS)", |
506 | "CGA (40 cols)", | 506 | "CGA (40 cols)", |
507 | "CGA (80 cols)", | 507 | "CGA (80 cols)", |
@@ -602,7 +602,7 @@ static void atari_set_checksum(void) | |||
602 | 602 | ||
603 | static struct { | 603 | static struct { |
604 | unsigned char val; | 604 | unsigned char val; |
605 | char *name; | 605 | const char *name; |
606 | } boot_prefs[] = { | 606 | } boot_prefs[] = { |
607 | { 0x80, "TOS" }, | 607 | { 0x80, "TOS" }, |
608 | { 0x40, "ASV" }, | 608 | { 0x40, "ASV" }, |
@@ -611,7 +611,7 @@ static struct { | |||
611 | { 0x00, "unspecified" } | 611 | { 0x00, "unspecified" } |
612 | }; | 612 | }; |
613 | 613 | ||
614 | static char *languages[] = { | 614 | static const char * const languages[] = { |
615 | "English (US)", | 615 | "English (US)", |
616 | "German", | 616 | "German", |
617 | "French", | 617 | "French", |
@@ -623,7 +623,7 @@ static char *languages[] = { | |||
623 | "Swiss (German)" | 623 | "Swiss (German)" |
624 | }; | 624 | }; |
625 | 625 | ||
626 | static char *dateformat[] = { | 626 | static const char * const dateformat[] = { |
627 | "MM%cDD%cYY", | 627 | "MM%cDD%cYY", |
628 | "DD%cMM%cYY", | 628 | "DD%cMM%cYY", |
629 | "YY%cMM%cDD", | 629 | "YY%cMM%cDD", |
@@ -634,7 +634,7 @@ static char *dateformat[] = { | |||
634 | "7 (undefined)" | 634 | "7 (undefined)" |
635 | }; | 635 | }; |
636 | 636 | ||
637 | static char *colors[] = { | 637 | static const char * const colors[] = { |
638 | "2", "4", "16", "256", "65536", "??", "??", "??" | 638 | "2", "4", "16", "256", "65536", "??", "??", "??" |
639 | }; | 639 | }; |
640 | 640 | ||