diff options
Diffstat (limited to 'src/hurd_mouse.c')
| -rw-r--r-- | src/hurd_mouse.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/hurd_mouse.c b/src/hurd_mouse.c index 2b0d786..3bf95a0 100644 --- a/src/hurd_mouse.c +++ b/src/hurd_mouse.c @@ -144,15 +144,7 @@ OsMousePreInit(InputInfoPtr pInfo, const char *protocol, int flags) xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, protocol); /* Collect the options, and process the common options. */ -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 - /* need some special handling here. xf86CollectInputOptions will reset - * pInfo->options. To re-merge the previously set arguments, pass the - * original pInfo->options in. - */ - xf86CollectInputOptions(pInfo, NULL, pInfo->options); -#else - COLLECT_INPUT_OPTIONS(pInfo, NULL); -#endif + xf86CollectInputOptions(pInfo, NULL); xf86ProcessCommonOptions(pInfo, pInfo->options); /* Check if the device can be opened. */ @@ -175,9 +167,6 @@ OsMousePreInit(InputInfoPtr pInfo, const char *protocol, int flags) /* Setup the local procs. */ pInfo->read_input = OsMouseReadInput; -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 - pInfo->flags |= XI86_CONFIGURED; -#endif return TRUE; } |