Index: lkcdutils/libklib/kl_util.c
===================================================================
RCS file: /home/cvs/lkcd/lkcdutils/lib/libklib/kl_util.c,v
retrieving revision 1.4
diff -a -u -r1.4 kl_util.c
--- lkcdutils/lib/libklib/kl_util.c	29 Jul 2005 12:22:03 -0000	1.4
+++ lkcdutils/lib/libklib/kl_util.c	5 Apr 2006 07:36:03 -0000
@@ -590,19 +590,10 @@
  */
 void kl_s390tod_to_timeval(uint64_t todval, struct timeval *xtime)
 {
-	if(KL_LINUX_RELEASE < LINUX_2_6_0){
-		/* adjust todclock to 1970 */
-		todval -= 0x8126d60e46000000LL - (0x3c26700LL * 1000000 * 4096);
+	/* adjust todclock to 1970 */
+	todval -= 0x8126d60e46000000LL - (0x3c26700LL * 1000000 * 4096);
 
-    		todval >>= 12;
-    		xtime->tv_sec  = todval / 1000000;
-    		xtime->tv_usec = todval % 1000000;
-	} else {
-		unsigned long long sec;
-		sec = todval >> 12;
-		sec = sec / 1000000;
-		xtime->tv_sec = sec;
-		todval -= (sec * 1000000) << 12;
-		xtime->tv_usec = ((todval * 1000) >> 12) / 1000;
-	}
+    	todval >>= 12;
+    	xtime->tv_sec  = todval / 1000000;
+    	xtime->tv_usec = todval % 1000000;
 }
