diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-10-23 09:24:10 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-10-23 09:24:10 -0400 |
| commit | d9214556b11a8d18ff588e60824c12041d30f791 (patch) | |
| tree | 04ab59d13961675811a55c96fb12b2b167b72318 /arch/arm/mach-netx/time.c | |
| parent | 72a1419a9d4c859a3345e4b83f8ef7d599d3818c (diff) | |
| parent | e82c6106b04b85879d802bbbeaed30d9b10a92e2 (diff) | |
Merge branches 'boards' and 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
Diffstat (limited to 'arch/arm/mach-netx/time.c')
| -rw-r--r-- | arch/arm/mach-netx/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-netx/time.c b/arch/arm/mach-netx/time.c index ac8e5bfed691..7c540c1f01fa 100644 --- a/arch/arm/mach-netx/time.c +++ b/arch/arm/mach-netx/time.c | |||
| @@ -21,9 +21,9 @@ | |||
| 21 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
| 22 | #include <linux/irq.h> | 22 | #include <linux/irq.h> |
| 23 | #include <linux/clocksource.h> | 23 | #include <linux/clocksource.h> |
| 24 | #include <linux/io.h> | ||
| 24 | 25 | ||
| 25 | #include <mach/hardware.h> | 26 | #include <mach/hardware.h> |
| 26 | #include <asm/io.h> | ||
| 27 | #include <asm/mach/time.h> | 27 | #include <asm/mach/time.h> |
| 28 | #include <mach/netx-regs.h> | 28 | #include <mach/netx-regs.h> |
| 29 | 29 | ||