diff -u -r linux.old/arch/x86_64/kernel/setup.c linux/arch/x86_64/kernel/setup.c
--- linux.old/arch/x86_64/kernel/setup.c	2006-06-21 13:01:39.671274579 +0200
+++ linux/arch/x86_64/kernel/setup.c	2006-06-21 12:46:59.805517772 +0200
@@ -1440,7 +1440,7 @@
 	.show =	show_cpuinfo,
 };
 
-#ifdef CONFIG_INPUT_PCSPKR
+#if defined(CONFIG_INPUT_PCSPKR) || defined(CONFIG_INPUT_PCSPKR_MODULE)
 #include <linux/platform_device.h>
 static __init int add_pcspkr(void)
 {