--- vt-orig.c	Thu May  3 14:53:13 2001
+++ vt.c	Thu May  3 23:45:46 2001
@@ -7,6 +7,7 @@
  *  Dynamic keymap and string allocation - aeb@cwi.nl - May 1994
  *  Restrict VT switching via ioctl() - grif@cs.ucr.edu - Dec 1995
  *  Some code moved for less code duplication - Andi Kleen - Mar 1997
+ *  Added ability to disable the pc speaker - nico@schottelius.org - May 2001
  */
 
 #include <linux/config.h>
@@ -93,9 +94,10 @@
  * comments - KDMKTONE doesn't put the process to sleep.
  */
 
-#if defined(__i386__) || defined(__alpha__) || defined(__powerpc__) \
+#if ( defined(__i386__) || defined(__alpha__) || defined(__powerpc__) \
     || (defined(__mips__) && !defined(CONFIG_SGI_IP22)) \
-    || (defined(__arm__) && defined(CONFIG_HOST_FOOTBRIDGE))
+    || (defined(__arm__) && defined(CONFIG_HOST_FOOTBRIDGE)) )
+    && !defined(CONFIG_DISABLE_PC_SPEAKER)
 
 static void
 kd_nosound(unsigned long ignored)
@@ -137,7 +139,7 @@
 	return;
 }
 
-#else
+#else /* else of machine check / disabling speaker */
 
 void
 _kd_mksound(unsigned int hz, unsigned int ticks)
