--- linux-2.6.20-rc1/include/asm-arm/system.h	2006-12-17 23:05:02.000000000 +0000
+++ linux-2.6.20-rc1-fix1/include/asm-arm/system.h	2006-12-17 23:32:24.000000000 +0000
@@ -73,6 +73,7 @@
 #ifndef __ASSEMBLY__
 
 #include <linux/linkage.h>
+#include <linux/irqflags.h>
 
 struct thread_info;
 struct task_struct;
@@ -176,7 +177,7 @@ extern unsigned long cr_alignment;	/* de
 #ifndef CONFIG_SMP
 static inline void adjust_cr(unsigned long mask, unsigned long set)
 {
-	unsigned long flags, cr;
+	unsigned long flags;
 
 	mask &= ~CR_A;