diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-20 23:14:32 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-20 23:14:32 +0300 |
| commit | e696268a73f7f59a333624f9abf8ffc9412ee64c (patch) | |
| tree | dcbb2ae8df180303d391d7a8e22f58e9f3f3f46a /arch/arm/mach-iop32x/glantank.c | |
| parent | 91aa69315ef9a76b8f734438617a2e32812b630f (diff) | |
| parent | 5a84d159061d914c8dd4aa372ac6e9529c2be453 (diff) | |
| download | linux-e696268a73f7f59a333624f9abf8ffc9412ee64c.tar.xz | |
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-iop32x/glantank.c')
| -rw-r--r-- | arch/arm/mach-iop32x/glantank.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-iop32x/glantank.c b/arch/arm/mach-iop32x/glantank.c index b9b765057dbe..45f4f13ae11b 100644 --- a/arch/arm/mach-iop32x/glantank.c +++ b/arch/arm/mach-iop32x/glantank.c @@ -31,6 +31,7 @@ #include <asm/mach/time.h> #include <asm/mach-types.h> #include <asm/page.h> +#include <asm/arch/time.h> /* * GLAN Tank timer tick configuration. @@ -38,12 +39,12 @@ static void __init glantank_timer_init(void) { /* 33.333 MHz crystal. */ - iop3xx_init_time(200000000); + iop_init_time(200000000); } static struct sys_timer glantank_timer = { .init = glantank_timer_init, - .offset = iop3xx_gettimeoffset, + .offset = iop_gettimeoffset, }; |