diff options
| author | Marc Singer <elf@com.rmk.(none)> | 2004-08-13 01:15:44 +0100 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2004-08-13 01:15:44 +0100 |
| commit | 85021953155c06503af6cfdedb69dea2a8583fbf (patch) | |
| tree | 9143be0b37d11a9009681c70c14082ab3435de7e /arch | |
| parent | 94fd05b430a38d32fb98887cdb5e894d0dbc33e6 (diff) | |
| download | history-85021953155c06503af6cfdedb69dea2a8583fbf.tar.gz | |
[ARM PATCH] 2002/1: lh7a40x Timer fixup
Patch from Marc Singer
The work already done to rectify the timer code initialization missed
a necessary change. This patch adds a timer initialization function
to the LPD7A400 machine type. It also makes a small correction to the
kernel configuration that is out of step with the machine specific
Kconfig.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-lh7a40x/arch-lpd7a40x.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index db5ad1f64c6d73..43adecf6ac3432 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -253,7 +253,7 @@ menu "General setup" # Select various configuration options depending on the machine type config DISCONTIGMEM bool - depends on ARCH_EDB7211 || ARCH_SA1100 || (ARCH_LH7A40X && !LH7A40X_SROMLL) + depends on ARCH_EDB7211 || ARCH_SA1100 || (ARCH_LH7A40X && !LH7A40X_CONTIGMEM) default y help Say Y to support efficient handling of discontiguous physical memory, diff --git a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c index 33eb4b8dd35883..9e0bf6c1823481 100644 --- a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c +++ b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c @@ -265,6 +265,7 @@ lpd7a400_map_io(void) #ifdef CONFIG_MACH_LPD7A400 extern void lh7a400_init_irq (void); +extern void lh7a40x_init_time (void); MACHINE_START (LPD7A400, "Logic Product Development LPD7A400-10") MAINTAINER ("Marc Singer") @@ -272,6 +273,7 @@ MACHINE_START (LPD7A400, "Logic Product Development LPD7A400-10") BOOT_PARAMS (0xc0000100) MAPIO (lpd7a400_map_io) INITIRQ (lh7a400_init_irq) + INITTIME (lh7a40x_init_time) INIT_MACHINE (lpd7a40x_init) MACHINE_END |