diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2004-06-24 10:02:08 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2004-06-24 10:02:08 +0100 |
| commit | 702fdfcae9a47ec4976d82d3d0b4b4a41bd72a52 (patch) | |
| tree | ae4354c39b18bcba1a4dd0ed89322988be78388d /arch/arm/kernel/setup.c | |
| parent | 8e2552a8f2addafc142626cd11d4bad9101c41c4 (diff) | |
| parent | 5e1c40de84c8e0514e8fe7e5db5087355dc00d5c (diff) | |
Merge cantab.net:/home/src/bklinux-2.6
into cantab.net:/home/src/ntfs-2.6
Diffstat (limited to 'arch/arm/kernel/setup.c')
| -rw-r--r-- | arch/arm/kernel/setup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 1cff09a5537a..d159659677b0 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -22,6 +22,7 @@ #include <linux/init.h> #include <linux/root_dev.h> #include <linux/cpu.h> +#include <linux/interrupt.h> #include <asm/elf.h> #include <asm/hardware.h> @@ -34,6 +35,7 @@ #include <asm/mach/arch.h> #include <asm/mach/irq.h> +#include <asm/mach/time.h> #ifndef MEM_SIZE #define MEM_SIZE (16*1024*1024) @@ -727,6 +729,7 @@ void __init setup_arch(char **cmdline_p) * Set up various architecture-specific pointers */ init_arch_irq = mdesc->init_irq; + init_arch_time = mdesc->init_time; init_machine = mdesc->init_machine; #ifdef CONFIG_VT |