From a9cdb6590cdf72917cdfeb17e2fcc6a110b2c7d1 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 11 Nov 2011 07:31:02 +1000
Subject: 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>
---
 src/evdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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++;
-- 
cgit v1.2.3