Commit 1763a6bb authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] M68k speaker driver can be a modular

Since m68kspkr can be a module, we need to initialize mach_beep() for a modular
m68kspkr as well.
parent 93bb6e22
...@@ -408,7 +408,7 @@ void __init config_amiga(void) ...@@ -408,7 +408,7 @@ void __init config_amiga(void)
#ifdef CONFIG_DUMMY_CONSOLE #ifdef CONFIG_DUMMY_CONSOLE
conswitchp = &dummy_con; conswitchp = &dummy_con;
#endif #endif
#ifdef CONFIG_INPUT_M68K_BEEP #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
mach_beep = amiga_mksound; mach_beep = amiga_mksound;
#endif #endif
......
...@@ -251,7 +251,7 @@ void __init config_atari(void) ...@@ -251,7 +251,7 @@ void __init config_atari(void)
conswitchp = &dummy_con; conswitchp = &dummy_con;
#endif #endif
mach_max_dma_address = 0xffffff; mach_max_dma_address = 0xffffff;
#ifdef CONFIG_INPUT_M68K_BEEP #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
mach_beep = atari_mksound; mach_beep = atari_mksound;
#endif #endif
#ifdef CONFIG_HEARTBEAT #ifdef CONFIG_HEARTBEAT
......
...@@ -98,7 +98,7 @@ EXPORT_SYMBOL(mach_heartbeat); ...@@ -98,7 +98,7 @@ EXPORT_SYMBOL(mach_heartbeat);
#ifdef CONFIG_M68K_L2_CACHE #ifdef CONFIG_M68K_L2_CACHE
void (*mach_l2_flush) (int) = NULL; void (*mach_l2_flush) (int) = NULL;
#endif #endif
#ifdef CONFIG_INPUT_M68K_BEEP #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
void (*mach_beep)(unsigned int, unsigned int) = NULL; void (*mach_beep)(unsigned int, unsigned int) = NULL;
#endif #endif
#if defined(CONFIG_ISA) && defined(MULTI_ISA) #if defined(CONFIG_ISA) && defined(MULTI_ISA)
......
...@@ -217,7 +217,7 @@ void __init config_mac(void) ...@@ -217,7 +217,7 @@ void __init config_mac(void)
#if 0 #if 0
mach_debug_init = mac_debug_init; mach_debug_init = mac_debug_init;
#endif #endif
#ifdef CONFIG_INPUT_M68K_BEEP #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
mach_beep = mac_mksound; mach_beep = mac_mksound;
#endif #endif
#ifdef CONFIG_HEARTBEAT #ifdef CONFIG_HEARTBEAT
......
...@@ -181,7 +181,7 @@ void __init config_q40(void) ...@@ -181,7 +181,7 @@ void __init config_q40(void)
mach_get_model = q40_get_model; mach_get_model = q40_get_model;
mach_get_hardware_list = q40_get_hardware_list; mach_get_hardware_list = q40_get_hardware_list;
#ifdef CONFIG_INPUT_M68K_BEEP #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
mach_beep = q40_mksound; mach_beep = q40_mksound;
#endif #endif
#ifdef CONFIG_HEARTBEAT #ifdef CONFIG_HEARTBEAT
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment