diff --git a/ChangeLog b/ChangeLog
index dbe8bf0d..2e511f43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Mar 29 08:05:46 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* module/sysprof-module.c: x86 merge happened in 2.6.25
+
 2008-03-23  Soren Sandmann <sandmann@daimi.au.dk>
 
 	* sysprof.c (queue_show_samples): Update samples immediately when
diff --git a/module/sysprof-module.c b/module/sysprof-module.c
index aac5155c..cb1c0f57 100644
--- a/module/sysprof-module.c
+++ b/module/sysprof-module.c
@@ -67,7 +67,7 @@ DECLARE_WAIT_QUEUE_HEAD (wait_for_trace);
 #	define REG_STACK_PTR rsp
 #	define REG_STACK_PTR0 rsp0
 #elif defined(CONFIG_X86)
-#	if LINUX_VERSION_CODE >= KERNEL_VERSION (2,6,24)
+#	if LINUX_VERSION_CODE >= KERNEL_VERSION (2,6,25)
 #		define REG_FRAME_PTR bp
 #		define REG_INS_PTR ip
 #		define REG_STACK_PTR sp