diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-11-11 07:31:02 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-11-11 07:31:40 +1000 |
| commit | a9cdb6590cdf72917cdfeb17e2fcc6a110b2c7d1 (patch) | |
| tree | 1fe9becb53f8443c8d34faf82129b472ba65abc6 | |
| parent | dd000dd4fa118529809632e610a0a439d7467096 (diff) | |
Move misplaced #endif caused by smooth-scrolling merge
Bad conflict resolution in xf86-input-evdev-2.6.0-30-g745fca0
Reported-by: Sebastian Glita <glseba@yahoo.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/evdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/evdev.c b/src/evdev.c index a7a0f3f..428d3c1 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1145,8 +1145,8 @@ EvdevAddRelValuatorClass(DeviceIntPtr device) /* We don't post wheel events, so ignore them here too */ if (axis == REL_WHEEL || axis == REL_HWHEEL || axis == REL_DIAL) continue; - if (!EvdevBitIsSet(pEvdev->rel_bitmask, axis)) #endif + if (!EvdevBitIsSet(pEvdev->rel_bitmask, axis)) continue; pEvdev->axis_map[axis] = i; i++; |