diff options
author | Petr Stehlik <pstehlik@sophics.cz> | 2008-11-18 15:02:18 -0500 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-03-16 14:10:41 -0400 |
commit | 65cd577d5e61043d1c1aec5812dea8a5c834652d (patch) | |
tree | 7823e6b01e354717dc5340e6231f48a357a6de9e /arch/m68k/kernel | |
parent | 93ff9542462ba5074fb6b6cd9e27c4fb04d452ec (diff) |
m68k/atari: Initial ARAnyM support
Add improved support for running under the ARAnyM emulator
(Atari Running on Any Machine - http://aranym.org/).
[michael, geert: Cleanups and updates]
Signed-off-by: Petr Stehlik <pstehlik@sophics.cz>
Signed-off-by: Michael Schmitz <schmitz@debian.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r-- | arch/m68k/kernel/setup.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c index b3963ab3d149..334d83640376 100644 --- a/arch/m68k/kernel/setup.c +++ b/arch/m68k/kernel/setup.c | |||
@@ -42,6 +42,7 @@ | |||
42 | #ifdef CONFIG_SUN3X | 42 | #ifdef CONFIG_SUN3X |
43 | #include <asm/dvma.h> | 43 | #include <asm/dvma.h> |
44 | #endif | 44 | #endif |
45 | #include <asm/natfeat.h> | ||
45 | 46 | ||
46 | #if !FPSTATESIZE || !NR_IRQS | 47 | #if !FPSTATESIZE || !NR_IRQS |
47 | #warning No CPU/platform type selected, your kernel will not work! | 48 | #warning No CPU/platform type selected, your kernel will not work! |
@@ -324,6 +325,10 @@ void __init setup_arch(char **cmdline_p) | |||
324 | panic("No configuration setup"); | 325 | panic("No configuration setup"); |
325 | } | 326 | } |
326 | 327 | ||
328 | #ifdef CONFIG_NATFEAT | ||
329 | nf_init(); | ||
330 | #endif | ||
331 | |||
327 | paging_init(); | 332 | paging_init(); |
328 | 333 | ||
329 | #ifndef CONFIG_SUN3 | 334 | #ifndef CONFIG_SUN3 |