From e5713538c5100dcfe1e3924596279025892c08a5 Mon Sep 17 00:00:00 2001
From: Haavard Skinnemoen <hskinnemoen@atmel.com>
Date: Mon, 4 Dec 2006 14:17:39 +0100
Subject: [PATCH] --- yaml --- r: 44256 b: refs/heads/master c:
 acc9252a36dcefbcdae12f88566300a80d925e11 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/avr32/kernel/avr32_ksyms.c | 2 +-
 trunk/arch/avr32/lib/delay.c          | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 77ebbad3faa6..411e8df42619 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2eb5090ee531a50533ba9e739071c21f98a5a77
+refs/heads/master: acc9252a36dcefbcdae12f88566300a80d925e11
diff --git a/trunk/arch/avr32/kernel/avr32_ksyms.c b/trunk/arch/avr32/kernel/avr32_ksyms.c
index 372e3f8b2417..7c4c76114bba 100644
--- a/trunk/arch/avr32/kernel/avr32_ksyms.c
+++ b/trunk/arch/avr32/kernel/avr32_ksyms.c
@@ -7,12 +7,12 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/module.h>
 
 #include <asm/checksum.h>
 #include <asm/uaccess.h>
-#include <asm/delay.h>
 
 /*
  * GCC functions
diff --git a/trunk/arch/avr32/lib/delay.c b/trunk/arch/avr32/lib/delay.c
index 462c8307b680..76a8474607f7 100644
--- a/trunk/arch/avr32/lib/delay.c
+++ b/trunk/arch/avr32/lib/delay.c
@@ -14,7 +14,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
 
-#include <asm/delay.h>
 #include <asm/processor.h>
 #include <asm/sysreg.h>