Messages in this thread Patch in this message |  | | Date | Thu, 11 Oct 2001 02:01:12 -0400 | From | Pete Zaitcev <> | Subject | Patch to touch up on Dell C600 workaround |
| |
Tim's change was good but it did not go far enough. The root of the evil was the type mismatch that went undetected because definitions were not in a header, and, therefore, diverged.
-- Pete
diff -ur -X dontdiff linux-2.4.10-ac10/arch/i386/kernel/dmi_scan.c linux-2.4.10-ac10-e/arch/i386/kernel/dmi_scan.c --- linux-2.4.10-ac10/arch/i386/kernel/dmi_scan.c Wed Oct 10 21:51:38 2001 +++ linux-2.4.10-ac10-e/arch/i386/kernel/dmi_scan.c Wed Oct 10 22:41:10 2001 @@ -7,7 +7,6 @@ #include <linux/slab.h> #include <asm/io.h> #include <linux/pm.h> -#include <linux/keyboard.h> #include <asm/keyboard.h> #include <asm/system.h> @@ -400,10 +399,6 @@ * Some Bioses enable the PS/2 mouse (touchpad) at resume, even if it * was disabled before the suspend. Linux gets terribly confused by that. */ - -typedef void (pm_kbd_func) (void); -extern pm_kbd_func *pm_kbd_request_override; - static __init int broken_ps2_resume(struct dmi_blacklist *d) { #ifdef CONFIG_VT @@ -412,10 +407,9 @@ pm_kbd_request_override = pckbd_pm_resume; printk(KERN_INFO "%s machine detected. Mousepad Resume Bug workaround enabled.\n", d->ident); } -#endif +#endif return 0; } - /* diff -ur -X dontdiff linux-2.4.10-ac10/include/asm-i386/keyboard.h linux-2.4.10-ac10-e/include/asm-i386/keyboard.h --- linux-2.4.10-ac10/include/asm-i386/keyboard.h Wed Oct 10 21:52:11 2001 +++ linux-2.4.10-ac10-e/include/asm-i386/keyboard.h Wed Oct 10 22:35:36 2001 @@ -30,6 +30,7 @@ extern void pckbd_leds(unsigned char leds); extern void pckbd_init_hw(void); extern int pckbd_pm_resume(struct pm_dev *, pm_request_t, void *); +extern pm_callback pm_kbd_request_override; extern unsigned char pckbd_sysrq_xlate[128]; #define kbd_setkeycode pckbd_setkeycode - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|  |