diff options
| -rw-r--r-- | arch/v850/kernel/as85ep1.c | 6 | ||||
| -rw-r--r-- | include/asm-v850/as85ep1.h | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/arch/v850/kernel/as85ep1.c b/arch/v850/kernel/as85ep1.c index 94ea12259f3e..6529be52037a 100644 --- a/arch/v850/kernel/as85ep1.c +++ b/arch/v850/kernel/as85ep1.c @@ -98,8 +98,6 @@ void __init mach_setup (char **cmdline) AS85EP1_PORT_PMC (LEDS_PORT) = 0; /* Make the LEDs port an I/O port. */ AS85EP1_PORT_PM (LEDS_PORT) = 0; /* Make all the bits output pins. */ mach_tick = as85ep1_led_tick; - - ROOT_DEV = MKDEV (BLKMEM_MAJOR, 0); } void __init mach_get_physical_ram (unsigned long *ram_start, @@ -133,10 +131,10 @@ void __init mach_reserve_bootmem () root_fs_image_end - root_fs_image_start); } -void mach_gettimeofday (struct timeval *tv) +void mach_gettimeofday (struct timespec *tv) { tv->tv_sec = 0; - tv->tv_usec = 0; + tv->tv_nsec = 0; } void __init mach_sched_init (struct irqaction *timer_action) diff --git a/include/asm-v850/as85ep1.h b/include/asm-v850/as85ep1.h index ceeb5f09f703..659bc910ffd7 100644 --- a/include/asm-v850/as85ep1.h +++ b/include/asm-v850/as85ep1.h @@ -14,8 +14,9 @@ #ifndef __V850_AS85EP1_H__ #define __V850_AS85EP1_H__ +#include <asm/v850e.h> + -#define CPU_ARCH "v850e" #define CPU_MODEL "as85ep1" #define CPU_MODEL_LONG "NEC V850E/AS85EP1" #define PLATFORM "AS85EP1" @@ -86,9 +87,6 @@ #define AS85EP1_PORT_PMC(n) (*(volatile u8 *)AS85EP1_PORT_PMC_ADDR(n)) -/* NB85E-style interrupt system. */ -#include <asm/nb85e_intc.h> - /* Hardware-specific interrupt numbers (in the kernel IRQ namespace). */ #define IRQ_INTCCC(n) (0x0C + (n)) #define IRQ_INTCCC_NUM 8 |