patch-2.4.0-test3 linux/arch/mips/kernel/setup.c

• Lines: 33
• Date: Sun Jul 9 22:18:15 2000
• Orig file: v2.4.0-test2/linux/arch/mips/kernel/setup.c
• Orig date: Tue May 23 15:31:33 2000

diff -u --recursive --new-file v2.4.0-test2/linux/arch/mips/kernel/setup.c linux/arch/mips/kernel/setup.c
@@ -76,7 +76,7 @@
 struct fd_ops *fd_ops;
 #endif
 
-#ifdef CONFIG_BLK_DEV_IDE
+#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
 extern struct ide_ops no_ide_ops;
 struct ide_ops *ide_ops;
 #endif
@@ -84,8 +84,10 @@
 extern struct rtc_ops no_rtc_ops;
 struct rtc_ops *rtc_ops;
 
+#ifdef CONFIG_PC_KEYB
 extern struct kbd_ops no_kbd_ops;
 struct kbd_ops *kbd_ops;
+#endif
 
 /*
  * Setup information
@@ -272,8 +274,11 @@
 	ide_ops = &no_ide_ops;
 #endif
 
-	rtc_ops = &no_rtc_ops;
+#ifdef CONFIG_PC_KEYB
 	kbd_ops = &no_kbd_ops;
+#endif
+	
+	rtc_ops = &no_rtc_ops;
 
 	switch(mips_machgroup)
 	{