diff options
author | Helge Deller <deller@gmx.de> | 2008-12-29 07:44:44 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-12-30 03:57:12 -0500 |
commit | c10a93a0a36b245ce48493f134b9e243a8bfddd1 (patch) | |
tree | 6994ab7afd367f176e2849e0d1c8c9c31994012e | |
parent | 34a4c5eb421dab6fe8381aa12c990f9d6f645b17 (diff) |
Input: HIL drivers - add MODULE_ALIAS()
Add MODULE_ALIAS() to the HIL keyboard (hil_kbd.c) and HIL mouse
(hil_ptr.c) drivers to make kernel module autoloader functional.
Report HIL port number ID in serio id.id field.
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r-- | drivers/input/keyboard/hil_kbd.c | 1 | ||||
-rw-r--r-- | drivers/input/mouse/hil_ptr.c | 2 | ||||
-rw-r--r-- | drivers/input/serio/hil_mlc.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c index 71c1971abf80..6f356705ee3b 100644 --- a/drivers/input/keyboard/hil_kbd.c +++ b/drivers/input/keyboard/hil_kbd.c | |||
@@ -47,6 +47,7 @@ | |||
47 | MODULE_AUTHOR("Brian S. Julin <bri@calyx.com>"); | 47 | MODULE_AUTHOR("Brian S. Julin <bri@calyx.com>"); |
48 | MODULE_DESCRIPTION(HIL_GENERIC_NAME " driver"); | 48 | MODULE_DESCRIPTION(HIL_GENERIC_NAME " driver"); |
49 | MODULE_LICENSE("Dual BSD/GPL"); | 49 | MODULE_LICENSE("Dual BSD/GPL"); |
50 | MODULE_ALIAS("serio:ty03pr25id00ex*"); | ||
50 | 51 | ||
51 | #define HIL_KBD_MAX_LENGTH 16 | 52 | #define HIL_KBD_MAX_LENGTH 16 |
52 | 53 | ||
diff --git a/drivers/input/mouse/hil_ptr.c b/drivers/input/mouse/hil_ptr.c index e532c48410ea..3263ce083bf0 100644 --- a/drivers/input/mouse/hil_ptr.c +++ b/drivers/input/mouse/hil_ptr.c | |||
@@ -46,7 +46,7 @@ | |||
46 | MODULE_AUTHOR("Brian S. Julin <bri@calyx.com>"); | 46 | MODULE_AUTHOR("Brian S. Julin <bri@calyx.com>"); |
47 | MODULE_DESCRIPTION(HIL_GENERIC_NAME " driver"); | 47 | MODULE_DESCRIPTION(HIL_GENERIC_NAME " driver"); |
48 | MODULE_LICENSE("Dual BSD/GPL"); | 48 | MODULE_LICENSE("Dual BSD/GPL"); |
49 | 49 | MODULE_ALIAS("serio:ty03pr25id0Fex*"); | |
50 | 50 | ||
51 | #define TABLET_SIMULATES_MOUSE /* allow tablet to be used as mouse */ | 51 | #define TABLET_SIMULATES_MOUSE /* allow tablet to be used as mouse */ |
52 | #undef TABLET_AUTOADJUST /* auto-adjust valid tablet ranges */ | 52 | #undef TABLET_AUTOADJUST /* auto-adjust valid tablet ranges */ |
diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c index 37586a68d345..7ba9f2b2c041 100644 --- a/drivers/input/serio/hil_mlc.c +++ b/drivers/input/serio/hil_mlc.c | |||
@@ -934,6 +934,7 @@ int hil_mlc_register(hil_mlc *mlc) | |||
934 | snprintf(mlc_serio->name, sizeof(mlc_serio->name)-1, "HIL_SERIO%d", i); | 934 | snprintf(mlc_serio->name, sizeof(mlc_serio->name)-1, "HIL_SERIO%d", i); |
935 | snprintf(mlc_serio->phys, sizeof(mlc_serio->phys)-1, "HIL%d", i); | 935 | snprintf(mlc_serio->phys, sizeof(mlc_serio->phys)-1, "HIL%d", i); |
936 | mlc_serio->id = hil_mlc_serio_id; | 936 | mlc_serio->id = hil_mlc_serio_id; |
937 | mlc_serio->id.id = i; /* HIL port no. */ | ||
937 | mlc_serio->write = hil_mlc_serio_write; | 938 | mlc_serio->write = hil_mlc_serio_write; |
938 | mlc_serio->open = hil_mlc_serio_open; | 939 | mlc_serio->open = hil_mlc_serio_open; |
939 | mlc_serio->close = hil_mlc_serio_close; | 940 | mlc_serio->close = hil_mlc_serio_close; |