diff options
author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2006-12-04 08:17:39 -0500 |
---|---|---|
committer | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2006-12-08 07:06:24 -0500 |
commit | acc9252a36dcefbcdae12f88566300a80d925e11 (patch) | |
tree | 0c5a9b8c966f8fa6cdb2c71676c12033ef66ac7c /arch | |
parent | c2eb5090ee531a50533ba9e739071c21f98a5a77 (diff) |
[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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/avr32/kernel/avr32_ksyms.c | 2 | ||||
-rw-r--r-- | arch/avr32/lib/delay.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/avr32/kernel/avr32_ksyms.c b/arch/avr32/kernel/avr32_ksyms.c index 372e3f8b2417..7c4c76114bba 100644 --- a/arch/avr32/kernel/avr32_ksyms.c +++ b/arch/avr32/kernel/avr32_ksyms.c | |||
@@ -7,12 +7,12 @@ | |||
7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
9 | */ | 9 | */ |
10 | #include <linux/delay.h> | ||
10 | #include <linux/io.h> | 11 | #include <linux/io.h> |
11 | #include <linux/module.h> | 12 | #include <linux/module.h> |
12 | 13 | ||
13 | #include <asm/checksum.h> | 14 | #include <asm/checksum.h> |
14 | #include <asm/uaccess.h> | 15 | #include <asm/uaccess.h> |
15 | #include <asm/delay.h> | ||
16 | 16 | ||
17 | /* | 17 | /* |
18 | * GCC functions | 18 | * GCC functions |
diff --git a/arch/avr32/lib/delay.c b/arch/avr32/lib/delay.c index 462c8307b680..76a8474607f7 100644 --- a/arch/avr32/lib/delay.c +++ b/arch/avr32/lib/delay.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
15 | #include <linux/types.h> | 15 | #include <linux/types.h> |
16 | 16 | ||
17 | #include <asm/delay.h> | ||
18 | #include <asm/processor.h> | 17 | #include <asm/processor.h> |
19 | #include <asm/sysreg.h> | 18 | #include <asm/sysreg.h> |
20 | 19 | ||