From: Pete Zaitcev <zaitcev@redhat.com>
To: alan@redhat.com
Cc: linux-kernel@vger.kernel.org
Subject: Patch to touch up on Dell C600 workaround
Date: Thu, 11 Oct 2001 02:01:12 -0400 [thread overview]
Message-ID: <20011011020112.A12557@devserv.devel.redhat.com> (raw)
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
reply other threads:[~2001-10-11 6:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20011011020112.A12557@devserv.devel.redhat.com \
--to=zaitcev@redhat.com \
--cc=alan@redhat.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox