Messages in this thread Patch in this message | | | From | Dmitry Torokhov <> | Subject | [PATCH 2/9] atkbd bad merge | Date | Sun, 29 Feb 2004 01:55:44 -0500 |
| |
===================================================================
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"); - 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/
| |