aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-12 11:48:28 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-12 11:48:28 -0500
commit709c12e3f5c5f3efd11d3fbd43d35535dc3a34d0 (patch)
tree5c5fd02aabecbbd10f8fb2ace81161300b320eb2
parent669bb4c58c3091cd54650e37c5f4e345dd12c564 (diff)
parentad595b77c4a8553516a5d76c9ecf68a0ff13960e (diff)
Merge tag 'm68k-for-v4.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: "Use seq_puts() for fixed strings" * tag 'm68k-for-v4.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/atari: Use seq_puts() in atari_get_hardware_list() m68k/amiga: Use seq_puts() in amiga_get_hardware_list()
-rw-r--r--arch/m68k/amiga/config.c3
-rw-r--r--arch/m68k/atari/config.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index ddb8192a3661..65f63a457130 100644
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
@@ -786,8 +786,7 @@ static void amiga_get_hardware_list(struct seq_file *m)
786 if (AMIGAHW_PRESENT(name)) \ 786 if (AMIGAHW_PRESENT(name)) \
787 seq_printf (m, "\t%s\n", str) 787 seq_printf (m, "\t%s\n", str)
788 788
789 seq_printf (m, "Detected hardware:\n"); 789 seq_puts(m, "Detected hardware:\n");
790
791 AMIGAHW_ANNOUNCE(AMI_VIDEO, "Amiga Video"); 790 AMIGAHW_ANNOUNCE(AMI_VIDEO, "Amiga Video");
792 AMIGAHW_ANNOUNCE(AMI_BLITTER, "Blitter"); 791 AMIGAHW_ANNOUNCE(AMI_BLITTER, "Blitter");
793 AMIGAHW_ANNOUNCE(AMBER_FF, "Amber Flicker Fixer"); 792 AMIGAHW_ANNOUNCE(AMBER_FF, "Amber Flicker Fixer");
diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c
index 97a3c38cd1f5..e328eaf816e3 100644
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
@@ -629,7 +629,7 @@ static void atari_get_hardware_list(struct seq_file *m)
629 if (ATARIHW_PRESENT(name)) \ 629 if (ATARIHW_PRESENT(name)) \
630 seq_printf(m, "\t%s\n", str) 630 seq_printf(m, "\t%s\n", str)
631 631
632 seq_printf(m, "Detected hardware:\n"); 632 seq_puts(m, "Detected hardware:\n");
633 ATARIHW_ANNOUNCE(STND_SHIFTER, "ST Shifter"); 633 ATARIHW_ANNOUNCE(STND_SHIFTER, "ST Shifter");
634 ATARIHW_ANNOUNCE(EXTD_SHIFTER, "STe Shifter"); 634 ATARIHW_ANNOUNCE(EXTD_SHIFTER, "STe Shifter");
635 ATARIHW_ANNOUNCE(TT_SHIFTER, "TT Shifter"); 635 ATARIHW_ANNOUNCE(TT_SHIFTER, "TT Shifter");