From 7f652fb963adb612a645dfce7e459b843cbfbff2 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Thu, 26 Jul 2007 17:34:29 +0100
Subject: [PATCH] --- yaml --- r: 62952 b: refs/heads/master c:
 8dc946307c45ab9a6f56c56371e1ccfb7155015e h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/ia64/kernel/time.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e9b30b0df8ec..e21e291bbe24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed5f6561436a1a0b38f4130bdb1fed00f14e60b5
+refs/heads/master: 8dc946307c45ab9a6f56c56371e1ccfb7155015e
diff --git a/trunk/arch/ia64/kernel/time.c b/trunk/arch/ia64/kernel/time.c
index 627785c48ea9..1169d46126ac 100644
--- a/trunk/arch/ia64/kernel/time.c
+++ b/trunk/arch/ia64/kernel/time.c
@@ -255,7 +255,7 @@ ia64_init_itm (void)
 	}
 }
 
-static cycle_t itc_get_cycles()
+static cycle_t itc_get_cycles(void)
 {
 	u64 lcycle, now, ret;