patch-2.4.19 linux-2.4.19/drivers/sbus/char/pcikbd.c

• Lines: 27
• Date: Fri Aug 2 17:39:44 2002
• Orig file: linux-2.4.18/drivers/sbus/char/pcikbd.c
• Orig date: Tue Aug 28 07:09:44 2001

diff -urN linux-2.4.18/drivers/sbus/char/pcikbd.c linux-2.4.19/drivers/sbus/char/pcikbd.c
@@ -29,7 +29,7 @@
 #include <linux/init.h>
 
 #include <asm/ebus.h>
-#if defined(CONFIG_USB) && defined(CONFIG_SPARC64)
+#if (defined(CONFIG_USB) || defined(CONFIG_USB_MODULE)) && defined(CONFIG_SPARC64)
 #include <asm/isa.h>
 #endif
 #include <asm/oplib.h>
@@ -640,7 +640,7 @@
 	restore_flags(flags);
 }
 
-#if defined(CONFIG_USB) && defined(CONFIG_SPARC64)
+#if (defined(CONFIG_USB) || defined(CONFIG_USB_MODULE)) && defined(CONFIG_SPARC64)
 static void isa_kd_nosound(unsigned long __unused)
 {
 	/* disable counter 2 */
@@ -758,7 +758,7 @@
 				}
 			}
 		}
-#ifdef CONFIG_USB
+#if defined(CONFIG_USB) || defined(CONFIG_USB_MODULE)
 		/* We are being called for the sake of USB keyboard
 		 * state initialization.  So we should check for beeper
 		 * device in this case.