patch-2.4.3 linux/arch/ppc/kernel/pmac_setup.c

• Lines: 46
• Date: Tue Mar 6 19:28:35 2001
• Orig file: v2.4.2/linux/arch/ppc/kernel/pmac_setup.c
• Orig date: Wed Feb 21 18:20:14 2001

diff -u --recursive --new-file v2.4.2/linux/arch/ppc/kernel/pmac_setup.c linux/arch/ppc/kernel/pmac_setup.c
@@ -81,7 +81,7 @@
 extern int mackbd_getkeycode(unsigned int scancode);
 extern int mackbd_translate(unsigned char keycode, unsigned char *keycodep,
 		     char raw_mode);
-extern int mackbd_unexpected_up(unsigned char keycode);
+extern char mackbd_unexpected_up(unsigned char keycode);
 extern void mackbd_leds(unsigned char leds);
 extern void __init mackbd_init_hw(void);
 extern int mac_hid_kbd_translate(unsigned char scancode, unsigned char *keycode,
@@ -253,6 +253,7 @@
 
 #endif
 
+#ifdef CONFIG_VT
 /*
  * Dummy mksound function that does nothing.
  * The real one is in the dmasound driver.
@@ -262,6 +263,7 @@
 pmac_mksound(unsigned int hz, unsigned int ticks)
 {
 }
+#endif /* CONFIG_VT */
 
 static volatile u32 *sysctrl_regs;
 
@@ -345,9 +347,9 @@
 #ifdef CONFIG_DUMMY_CONSOLE
 	conswitchp = &dummy_con;
 #endif
-
+#ifdef CONFIG_VT
 	kd_mksound = pmac_mksound;
-
+#endif
 #ifdef CONFIG_BLK_DEV_INITRD
 	if (initrd_start)
 		ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0);
@@ -380,7 +382,7 @@
 void *boot_host;
 int boot_target;
 int boot_part;
-kdev_t boot_dev;
+extern kdev_t boot_dev;
 
 void __init
 pmac_init2(void)