diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-12-30 04:10:06 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-12-30 04:10:06 -0500 |
| commit | 1dd3294677d5484e4813c6c454ba7f192a3ef61d (patch) | |
| tree | e29306ffe8b709a7499a25ecbe3234f833fc7002 /drivers/input/mouse/hil_ptr.c | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| parent | e941da3110422c4e57c3d05759fb9475b28f45f6 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/mouse/hil_ptr.c')
| -rw-r--r-- | drivers/input/mouse/hil_ptr.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |