diff options
author | Sam Creasey <sammy@sammy.net> | 2006-12-09 04:34:38 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-09 12:41:18 -0500 |
commit | a3a79bd7c75f0055df16540c7e9dbe270060ebe8 (patch) | |
tree | 6c115200e1c607a6f19007ae0953be67171ad39a /include/asm-m68k | |
parent | 8e8858e932a81d827e194abf82faf32d02396f55 (diff) |
[PATCH] Sun3: General updates
General compile fixes for 2.6.16 for sun3, and some updates to make the new
bootloader work correctly. Tested on 3/50, 3/60, 3/80.
Signed-off-by: Sam Creasey <sammy@sammy.net>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-m68k')
-rw-r--r-- | include/asm-m68k/sun3-head.h | 1 | ||||
-rw-r--r-- | include/asm-m68k/sun3ints.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m68k/sun3-head.h b/include/asm-m68k/sun3-head.h index f799d95bad53..e74f384e269f 100644 --- a/include/asm-m68k/sun3-head.h +++ b/include/asm-m68k/sun3-head.h | |||
@@ -4,7 +4,6 @@ | |||
4 | 4 | ||
5 | #define KERNBASE 0xE000000 /* First address the kernel will eventually be */ | 5 | #define KERNBASE 0xE000000 /* First address the kernel will eventually be */ |
6 | #define LOAD_ADDR 0x4000 /* prom jumps to us here unless this is elf /boot */ | 6 | #define LOAD_ADDR 0x4000 /* prom jumps to us here unless this is elf /boot */ |
7 | #define BI_START (KERNBASE + 0x3000) /* beginning of the bootinfo records */ | ||
8 | #define FC_CONTROL 3 | 7 | #define FC_CONTROL 3 |
9 | #define FC_SUPERD 5 | 8 | #define FC_SUPERD 5 |
10 | #define FC_CPU 7 | 9 | #define FC_CPU 7 |
diff --git a/include/asm-m68k/sun3ints.h b/include/asm-m68k/sun3ints.h index de91fa071b99..309d6e6a1374 100644 --- a/include/asm-m68k/sun3ints.h +++ b/include/asm-m68k/sun3ints.h | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <asm/intersil.h> | 16 | #include <asm/intersil.h> |
17 | #include <asm/oplib.h> | 17 | #include <asm/oplib.h> |
18 | #include <asm/traps.h> | 18 | #include <asm/traps.h> |
19 | #include <asm/irq.h> | ||
19 | 20 | ||
20 | #define SUN3_INT_VECS 192 | 21 | #define SUN3_INT_VECS 192 |
21 | 22 | ||