aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-iop13xx/iq81340mc.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-20 15:14:32 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-20 15:14:32 -0500
commite696268a73f7f59a333624f9abf8ffc9412ee64c (patch)
treedcbb2ae8df180303d391d7a8e22f58e9f3f3f46a /arch/arm/mach-iop13xx/iq81340mc.c
parent91aa69315ef9a76b8f734438617a2e32812b630f (diff)
parent5a84d159061d914c8dd4aa372ac6e9529c2be453 (diff)
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 4165/1: S3C24XX: Select CONFIG_NO_IOPORT [ARM] Fix s3c2410 ALSA audio for typedef elimination [ARM] Fix ARM AACI ALSA driver [ARM] fix mach-at91 build breakage [ARM] Fix jornada720 build errors [ARM] Fix iop13xx build error [ARM] Fix build error caused by move of apm [ARM] 4223/1: ixdp2351 : Fix for a define error [ARM] 4187/1: iop: unify time implementation across iop32x, iop33x, and iop13xx [ARM] 4186/1: iop: remove cp6_enable/disable routines [ARM] 4185/2: entry: introduce get_irqnr_preamble and arch_ret_to_user
Diffstat (limited to 'arch/arm/mach-iop13xx/iq81340mc.c')
-rw-r--r--arch/arm/mach-iop13xx/iq81340mc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-iop13xx/iq81340mc.c b/arch/arm/mach-iop13xx/iq81340mc.c
index 2a1bbfe9896f..a519d707571c 100644
--- a/arch/arm/mach-iop13xx/iq81340mc.c
+++ b/arch/arm/mach-iop13xx/iq81340mc.c
@@ -25,6 +25,7 @@
25#include <asm/mach/arch.h> 25#include <asm/mach/arch.h>
26#include <asm/arch/pci.h> 26#include <asm/arch/pci.h>
27#include <asm/mach/time.h> 27#include <asm/mach/time.h>
28#include <asm/arch/time.h>
28 29
29extern int init_atu; /* Flag to select which ATU(s) to initialize / disable */ 30extern int init_atu; /* Flag to select which ATU(s) to initialize / disable */
30 31
@@ -78,12 +79,12 @@ static void __init iq81340mc_init(void)
78 79
79static void __init iq81340mc_timer_init(void) 80static void __init iq81340mc_timer_init(void)
80{ 81{
81 iop13xx_init_time(400000000); 82 iop_init_time(400000000);
82} 83}
83 84
84static struct sys_timer iq81340mc_timer = { 85static struct sys_timer iq81340mc_timer = {
85 .init = iq81340mc_timer_init, 86 .init = iq81340mc_timer_init,
86 .offset = iop13xx_gettimeoffset, 87 .offset = iop_gettimeoffset,
87}; 88};
88 89
89MACHINE_START(IQ81340MC, "Intel IQ81340MC") 90MACHINE_START(IQ81340MC, "Intel IQ81340MC")