Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Alexandre Belloni and committed by
Greg Ungerer
375bc91e b47c7b6f

+5 -4
+5
arch/m68k/kernel/setup.c
··· 4 4 #else 5 5 #include "setup_no.c" 6 6 #endif 7 + 8 + #if IS_ENABLED(CONFIG_INPUT_M68K_BEEP) 9 + void (*mach_beep)(unsigned int, unsigned int); 10 + EXPORT_SYMBOL(mach_beep); 11 + #endif
-4
arch/m68k/kernel/setup_mm.c
··· 106 106 #ifdef CONFIG_M68K_L2_CACHE 107 107 void (*mach_l2_flush) (int); 108 108 #endif 109 - #if IS_ENABLED(CONFIG_INPUT_M68K_BEEP) 110 - void (*mach_beep)(unsigned int, unsigned int); 111 - EXPORT_SYMBOL(mach_beep); 112 - #endif 113 109 #if defined(CONFIG_ISA) && defined(MULTI_ISA) 114 110 int isa_type; 115 111 int isa_sex;