diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-26 01:09:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-26 01:09:09 -0700 |
| commit | d0f06170da573a93b52b6d3049be42cd57038f4e (patch) | |
| tree | 5c01060d1abfaef219738e925e1c4ff7c1efd526 | |
| parent | f4f988e28c2072292f8593edc7aff614fd35495c (diff) | |
| parent | cefa6acd8e3161960e0a6dcafca78c1d4dee465c (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux
| -rw-r--r-- | arch/arm/mach-sa1100/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/time.c | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile index 0193b4bd34ae..d560562da7ed 100644 --- a/arch/arm/mach-sa1100/Makefile +++ b/arch/arm/mach-sa1100/Makefile @@ -3,7 +3,7 @@ # # Common support -obj-y := generic.o irq.o dma.o +obj-y := generic.o irq.o dma.o time.o obj-m := obj-n := obj- := diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c index e58463b02e67..1c3d082f8d49 100644 --- a/arch/arm/mach-sa1100/time.c +++ b/arch/arm/mach-sa1100/time.c @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-sa1100/time.h + * linux/arch/arm/mach-sa1100/time.c * * Copyright (C) 1998 Deborah Wallach. * Twiddles (C) 1999 Hugo Fiennes <hugo@empeg.com> @@ -8,7 +8,14 @@ * Rewritten: big cleanup, much simpler, better HZ accuracy. * */ - +#include <linux/init.h> +#include <linux/errno.h> +#include <linux/interrupt.h> +#include <linux/timex.h> +#include <linux/signal.h> + +#include <asm/mach/time.h> +#include <asm/hardware.h> #define RTC_DEF_DIVIDER (32768 - 1) #define RTC_DEF_TRIM 0 |