include/asm-arm/arch-pxa/timex.h |    2 ++
 kernel/latency_trace.c           |    2 ++
 2 files changed, 4 insertions(+)
=================================================================
--- ./kernel/latency_trace.c.ORG	2006-09-20 21:10:15.000000000 -0400
+++ ./kernel/latency_trace.c	2006-09-21 21:28:49.000000000 -0400
@@ -150,6 +150,8 @@ enum trace_flag_type
  */
 #if !defined(CONFIG_DEBUG_PAGEALLOC) && !defined(CONFIG_SMP) && !defined(CONFIG_ARM)
 # define MAX_TRACE (unsigned long)(8192*16-1)
+#elif defined(CONFIG_ARM)      /* 4MB kernel image size limitation */
+# define MAX_TRACE (unsigned long)(128*2-1)
 #else
 # define MAX_TRACE (unsigned long)(8192*2-1)
 #endif
=================================================================
--- ./include/asm-arm/arch-pxa/timex.h.ORG	2006-09-20 21:10:15.000000000 -0400
+++ ./include/asm-arm/arch-pxa/timex.h	2006-09-21 21:57:43.000000000 -0400
@@ -16,6 +16,8 @@
 #define CLOCK_TICK_RATE 3686400
 #elif defined(CONFIG_PXA27x)
 /* PXA27x timer base */
+#include <asm-arm/arch-pxa/hardware.h>
+#include <asm-arm/arch-pxa/pxa-regs.h>
 #ifdef CONFIG_MACH_MAINSTONE
 #define CLOCK_TICK_RATE 3249600
 #else