From: Dmitry Torokhov <dtor_core@ameritech.net>
To: Vojtech Pavlik <vojtech@suse.cz>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 2/9] atkbd bad merge
Date: Sun, 29 Feb 2004 01:55:44 -0500 [thread overview]
Message-ID: <200402290155.46360.dtor_core@ameritech.net> (raw)
In-Reply-To: <200402290155.04825.dtor_core@ameritech.net>
===================================================================
ChangeSet@1.1686, 2004-02-27 23:42:30-05:00, dtor_core@ameritech.net
Atkbd: Clean up unclean merge (remove old MODULE_PARMs)
atkbd.c | 6 +-----
1 files changed, 1 insertion(+), 5 deletions(-)
===================================================================
diff -Nru a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
--- a/drivers/input/keyboard/atkbd.c Sun Feb 29 01:15:45 2004
+++ b/drivers/input/keyboard/atkbd.c Sun Feb 29 01:15:45 2004
@@ -30,21 +30,17 @@
MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
MODULE_DESCRIPTION("AT and PS/2 keyboard driver");
-MODULE_PARM(atkbd_set, "1i");
-MODULE_PARM(atkbd_reset, "1i");
-MODULE_PARM(atkbd_softrepeat, "1i");
MODULE_LICENSE("GPL");
static int atkbd_set = 2;
module_param_named(set, atkbd_set, int, 0);
MODULE_PARM_DESC(set, "Select keyboard code set (2 = default, 3, 4)");
+
#if defined(__i386__) || defined(__x86_64__) || defined(__hppa__)
static int atkbd_reset;
#else
static int atkbd_reset = 1;
#endif
-static int atkbd_softrepeat;
-
module_param_named(reset, atkbd_reset, bool, 0);
MODULE_PARM_DESC(reset, "Reset keyboard during initialization");
next prev parent reply other threads:[~2004-02-29 7:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-02-29 6:53 [PATCH 0/9] New set of input patches Dmitry Torokhov
2004-02-29 6:55 ` [PATCH 1/9] atkbd whitespace fixes Dmitry Torokhov
2004-02-29 6:55 ` Dmitry Torokhov [this message]
2004-02-29 6:56 ` [PATCH 3/9] synaptics strict/relaxed protocol checks Dmitry Torokhov
2004-02-29 6:58 ` [PATCH 4/9] psmouse whitespace fixes Dmitry Torokhov
2004-02-29 6:58 ` [PATCH 5/9] psmouse broken hardware workaround Dmitry Torokhov
2004-02-29 7:00 ` [PATCH 6/9] introduce module_param_array_named Dmitry Torokhov
2004-02-29 7:01 ` [PATCH 7/9] Move joysticks to the module_param way of handling options Dmitry Torokhov
2004-02-29 7:02 ` [PATCH 8/9] introduce __obsolete_setup Dmitry Torokhov
2004-02-29 7:03 ` [PATCH 9/9] Document removed input options using __obsolete_setup Dmitry Torokhov
2004-03-02 13:02 ` [PATCH 0/9] New set of input patches Vojtech Pavlik
2004-03-02 17:45 ` Dmitry Torokhov
2004-03-02 23:56 ` bkbits hosting (was Re: [PATCH 0/9] New set of input patches) Andy Isaacson
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=200402290155.46360.dtor_core@ameritech.net \
--to=dtor_core@ameritech.net \
--cc=linux-kernel@vger.kernel.org \
--cc=vojtech@suse.cz \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.