mach_beep is defined arch/m68k/kernel/setup_mm.c which is compiled only
when MMU is selected.
To avoid linking errors, make INPUT_M68K_BEEP depend on MMU.
Signed-off-by: Alexandre Belloni <[email protected]>
---
drivers/input/misc/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 3872488c3fd7..7a44f633a413 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -178,7 +178,7 @@ config INPUT_SPARCSPKR
config INPUT_M68K_BEEP
tristate "M68k Beeper support"
- depends on M68K
+ depends on M68K && MMU
config INPUT_MAX77693_HAPTIC
tristate "MAXIM MAX77693/MAX77843 haptic controller support"
--
2.14.1
On Thu, Aug 24, 2017 at 04:44:27PM +0200, Alexandre Belloni wrote:
> mach_beep is defined arch/m68k/kernel/setup_mm.c which is compiled only
> when MMU is selected.
>
> To avoid linking errors, make INPUT_M68K_BEEP depend on MMU.
Hmm, can we maybe pull mach_beep from setup_mm.c to setup.c? MMU
dependency seems to be artificial.
>
> Signed-off-by: Alexandre Belloni <[email protected]>
> ---
> drivers/input/misc/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
> index 3872488c3fd7..7a44f633a413 100644
> --- a/drivers/input/misc/Kconfig
> +++ b/drivers/input/misc/Kconfig
> @@ -178,7 +178,7 @@ config INPUT_SPARCSPKR
>
> config INPUT_M68K_BEEP
> tristate "M68k Beeper support"
> - depends on M68K
> + depends on M68K && MMU
>
> config INPUT_MAX77693_HAPTIC
> tristate "MAXIM MAX77693/MAX77843 haptic controller support"
> --
> 2.14.1
>
Thanks.
--
Dmitry
Hi Dmitry,
On Mon, Aug 28, 2017 at 6:50 PM, Dmitry Torokhov
<[email protected]> wrote:
> On Thu, Aug 24, 2017 at 04:44:27PM +0200, Alexandre Belloni wrote:
>> mach_beep is defined arch/m68k/kernel/setup_mm.c which is compiled only
>> when MMU is selected.
>>
>> To avoid linking errors, make INPUT_M68K_BEEP depend on MMU.
>
> Hmm, can we maybe pull mach_beep from setup_mm.c to setup.c? MMU
Sounds OK to me. Greg?
> dependency seems to be artificial.
That's indeed artificial, it's really a platform dependency.
But currently these platforms (Amiga and Atari) do not support mmu-less
operation (yet).
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Hi Geert, Dmitry, Alexandre,
On 29/08/17 03:15, Geert Uytterhoeven wrote:
> On Mon, Aug 28, 2017 at 6:50 PM, Dmitry Torokhov
> <[email protected]> wrote:
>> On Thu, Aug 24, 2017 at 04:44:27PM +0200, Alexandre Belloni wrote:
>>> mach_beep is defined arch/m68k/kernel/setup_mm.c which is compiled only
>>> when MMU is selected.
>>>
>>> To avoid linking errors, make INPUT_M68K_BEEP depend on MMU.
>>
>> Hmm, can we maybe pull mach_beep from setup_mm.c to setup.c? MMU
>
> Sounds OK to me. Greg?
Yeah, I have no problem with that.
At the moment though setup.c is a basic stub with only this in it:
#ifdef CONFIG_MMU
#include "setup_mm.c"
#else
#include "setup_no.c"
#endif
It is one of the very few files remaining that we have not fully
re-merged from the original MMU and no-MMU versions.
Maybe its time we looked at cleaning this up as well...
Regards
Greg
>> dependency seems to be artificial.
>
> That's indeed artificial, it's really a platform dependency.
> But currently these platforms (Amiga and Atari) do not support mmu-less
> operation (yet).
>
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> -- Linus Torvalds
>