From: Haavard Skinnemoen <hskinnemoen@atmel.com>
Date: Mon, 4 Dec 2006 13:17:39 +0000 (+0100)
Subject: [AVR32] Don't include <asm/delay.h>
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=acc9252a36dcefbcdae12f88566300a80d925e11;p=mv-sheeva.git

[AVR32] Don't include <asm/delay.h>

Include <linux/delay.h> instead of <asm/delay.h> from a few places.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
---

diff --git a/arch/avr32/kernel/avr32_ksyms.c b/arch/avr32/kernel/avr32_ksyms.c
index 372e3f8b241..7c4c76114bb 100644
--- a/arch/avr32/kernel/avr32_ksyms.c
+++ b/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/arch/avr32/lib/delay.c b/arch/avr32/lib/delay.c
index 462c8307b68..76a8474607f 100644
--- a/arch/avr32/lib/delay.c
+++ b/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>