diff options
| author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2006-12-04 14:17:39 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2006-12-08 13:06:24 +0100 |
| commit | acc9252a36dcefbcdae12f88566300a80d925e11 (patch) | |
| tree | 0c5a9b8c966f8fa6cdb2c71676c12033ef66ac7c /arch | |
| parent | [AVR32] Put the chip in "stop" mode when halting the system (diff) | |
| download | linux-acc9252a36dcefbcdae12f88566300a80d925e11.tar.xz linux-acc9252a36dcefbcdae12f88566300a80d925e11.zip | |
[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 @@ * 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 462c8307b680..76a8474607f7 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> |