[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.

diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index 7e6f80e68202d8df0cc98d7e76742a2768fb01f2..ac9435df1849e8fdfc306e96653f378be7dc0ea2 100644 (file)
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
@@ -408,7 +408,7 @@ void __init config_amiga(void)
 #ifdef CONFIG_DUMMY_CONSOLE
   conswitchp           = &dummy_con;
 #endif
-#ifdef CONFIG_INPUT_M68K_BEEP
+#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
   mach_beep            = amiga_mksound;
 #endif
 

diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c
index 856473792ff1ee8d0646f039f58a271fec38a233..0b36cdf8e8c9af2d8b92aee9d1b3c00e75860004 100644 (file)
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
@@ -251,7 +251,7 @@ void __init config_atari(void)
     conswitchp          = &dummy_con;
 #endif
     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;
 #endif
 #ifdef CONFIG_HEARTBEAT

diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c
index d32a585e44c2192cbdea4bd443a980bc2c104758..1126adff2296cdd39b94c0a645af9b15f9b8e732 100644 (file)
--- a/arch/m68k/kernel/setup.c
+++ b/arch/m68k/kernel/setup.c
@@ -98,7 +98,7 @@ EXPORT_SYMBOL(mach_heartbeat);
 #ifdef CONFIG_M68K_L2_CACHE
 void (*mach_l2_flush) (int) = NULL;
 #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;
 #endif
 #if defined(CONFIG_ISA) && defined(MULTI_ISA)

diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index 835b557dffea2168ced8dfc62871867455601093..bbb6dc085fb76ab2401f71722612fc1489d45efb 100644 (file)
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -217,7 +217,7 @@ void __init config_mac(void)
 #if 0
        mach_debug_init  = mac_debug_init;
 #endif
-#ifdef CONFIG_INPUT_M68K_BEEP
+#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
         mach_beep            = mac_mksound;
 #endif
 #ifdef CONFIG_HEARTBEAT

diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index e05e9614d6ad8ec9c8933012a39d7267630487ab..a5e0500fd3d88121e0ae3a0bb89a5eb59bd9292f 100644 (file)
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
@@ -181,7 +181,7 @@ void __init config_q40(void)
     mach_get_model       = q40_get_model;
     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;
 #endif
 #ifdef CONFIG_HEARTBEAT