diff options
Diffstat (limited to 'arch/m68k/sun3/config.c')
-rw-r--r-- | arch/m68k/sun3/config.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c index 8dfaa201342e..2ca25bd01a96 100644 --- a/arch/m68k/sun3/config.c +++ b/arch/m68k/sun3/config.c | |||
@@ -27,23 +27,21 @@ | |||
27 | #include <asm/sun3mmu.h> | 27 | #include <asm/sun3mmu.h> |
28 | #include <asm/rtc.h> | 28 | #include <asm/rtc.h> |
29 | #include <asm/machdep.h> | 29 | #include <asm/machdep.h> |
30 | #include <asm/idprom.h> | ||
30 | #include <asm/intersil.h> | 31 | #include <asm/intersil.h> |
31 | #include <asm/irq.h> | 32 | #include <asm/irq.h> |
33 | #include <asm/sections.h> | ||
32 | #include <asm/segment.h> | 34 | #include <asm/segment.h> |
33 | #include <asm/sun3ints.h> | 35 | #include <asm/sun3ints.h> |
34 | 36 | ||
35 | extern char _text, _end; | ||
36 | |||
37 | char sun3_reserved_pmeg[SUN3_PMEGS_NUM]; | 37 | char sun3_reserved_pmeg[SUN3_PMEGS_NUM]; |
38 | 38 | ||
39 | extern unsigned long sun3_gettimeoffset(void); | 39 | extern unsigned long sun3_gettimeoffset(void); |
40 | static void sun3_sched_init(irq_handler_t handler); | 40 | static void sun3_sched_init(irq_handler_t handler); |
41 | extern void sun3_get_model (char* model); | 41 | extern void sun3_get_model (char* model); |
42 | extern void idprom_init (void); | ||
43 | extern int sun3_hwclk(int set, struct rtc_time *t); | 42 | extern int sun3_hwclk(int set, struct rtc_time *t); |
44 | 43 | ||
45 | volatile char* clock_va; | 44 | volatile char* clock_va; |
46 | extern volatile unsigned char* sun3_intreg; | ||
47 | extern unsigned long availmem; | 45 | extern unsigned long availmem; |
48 | unsigned long num_pages; | 46 | unsigned long num_pages; |
49 | 47 | ||
@@ -149,7 +147,7 @@ void __init config_sun3(void) | |||
149 | mach_halt = sun3_halt; | 147 | mach_halt = sun3_halt; |
150 | mach_get_hardware_list = sun3_get_hardware_list; | 148 | mach_get_hardware_list = sun3_get_hardware_list; |
151 | 149 | ||
152 | memory_start = ((((int)&_end) + 0x2000) & ~0x1fff); | 150 | memory_start = ((((unsigned long)_end) + 0x2000) & ~0x1fff); |
153 | // PROM seems to want the last couple of physical pages. --m | 151 | // PROM seems to want the last couple of physical pages. --m |
154 | memory_end = *(romvec->pv_sun3mem) + PAGE_OFFSET - 2*PAGE_SIZE; | 152 | memory_end = *(romvec->pv_sun3mem) + PAGE_OFFSET - 2*PAGE_SIZE; |
155 | 153 | ||