[lkml]   [2017]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[PATCH] 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 <>

I didn't merge both files because I don't have any way to test the result.

arch/m68k/kernel/setup.c | 5 +++++
arch/m68k/kernel/setup_mm.c | 4 ----
2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c
index 4bf129f1d2e2..81cadb55b2a2 100644
--- a/arch/m68k/kernel/setup.c
+++ b/arch/m68k/kernel/setup.c
@@ -3,3 +3,8 @@
#include "setup_no.c"
+void (*mach_beep)(unsigned int, unsigned int);
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index 7a2c21212820..ac5c9ee9bbf9 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -105,10 +105,6 @@ EXPORT_SYMBOL(mach_heartbeat);
void (*mach_l2_flush) (int);
-void (*mach_beep)(unsigned int, unsigned int);
#if defined(CONFIG_ISA) && defined(MULTI_ISA)
int isa_type;
int isa_sex;
 \ /
  Last update: 2017-09-28 11:45    [W:0.035 / U:0.184 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site