Commit 375bc91e authored Sep 28, 2017 by Alexandre Belloni Committed by Greg Ungerer Nov 06, 2017

m68k: pull mach_beep in setup.c



It is possible to select INPUT_M68K_BEEP in a nommu configuration. This
results in the following link error:

drivers/input/misc/m68kspkr.o: In function `m68kspkr_event':
m68kspkr.c:(.text+0x3a): undefined reference to `mach_beep'
m68kspkr.c:(.text+0x5e): undefined reference to `mach_beep'
m68kspkr.c:(.text+0x78): undefined reference to `mach_beep'
drivers/input/misc/m68kspkr.o: In function `m68kspkr_init':
m68kspkr.c:(.init.text+0x4): undefined reference to `mach_beep'

Pull the mach_beep definition in setup.c to avoid it.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>

parent b47c7b6f

arch/m68k/kernel/setup.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -4,3 +4,8 @@
		#else
		#include "setup_no.c"
		#endif

		#if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)
		void (*mach_beep)(unsigned int, unsigned int);
		EXPORT_SYMBOL(mach_beep);
		#endif

arch/m68k/kernel/setup_mm.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -106,10 +106,6 @@ EXPORT_SYMBOL(mach_heartbeat);
		#ifdef CONFIG_M68K_L2_CACHE
		void (*mach_l2_flush) (int);
		#endif
		#if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)
		void (*mach_beep)(unsigned int, unsigned int);
		EXPORT_SYMBOL(mach_beep);
		#endif
		#if defined(CONFIG_ISA) && defined(MULTI_ISA)
		int isa_type;
		int isa_sex;

Admin message