Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 709c12e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 669bb4c5 ad595b77

arch/m68k/amiga/config.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -786,8 +786,7 @@ static void amiga_get_hardware_list(struct seq_file *m) 
	if (AMIGAHW_PRESENT(name))			\

	if (AMIGAHW_PRESENT(name))			\

		seq_printf (m, "\t%s\n", str)

		seq_printf (m, "\t%s\n", str)





	seq_printf (m, "Detected hardware:\n");

	seq_puts(m, "Detected hardware:\n");



	AMIGAHW_ANNOUNCE(AMI_VIDEO, "Amiga Video");

	AMIGAHW_ANNOUNCE(AMI_VIDEO, "Amiga Video");

	AMIGAHW_ANNOUNCE(AMI_BLITTER, "Blitter");

	AMIGAHW_ANNOUNCE(AMI_BLITTER, "Blitter");

	AMIGAHW_ANNOUNCE(AMBER_FF, "Amber Flicker Fixer");

	AMIGAHW_ANNOUNCE(AMBER_FF, "Amber Flicker Fixer");

arch/m68k/atari/config.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -629,7 +629,7 @@ static void atari_get_hardware_list(struct seq_file *m) 
	if (ATARIHW_PRESENT(name))			\

	if (ATARIHW_PRESENT(name))			\

		seq_printf(m, "\t%s\n", str)

		seq_printf(m, "\t%s\n", str)





	seq_printf(m, "Detected hardware:\n");

	seq_puts(m, "Detected hardware:\n");

	ATARIHW_ANNOUNCE(STND_SHIFTER, "ST Shifter");

	ATARIHW_ANNOUNCE(STND_SHIFTER, "ST Shifter");

	ATARIHW_ANNOUNCE(EXTD_SHIFTER, "STe Shifter");

	ATARIHW_ANNOUNCE(EXTD_SHIFTER, "STe Shifter");

	ATARIHW_ANNOUNCE(TT_SHIFTER, "TT Shifter");

	ATARIHW_ANNOUNCE(TT_SHIFTER, "TT Shifter");