summaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel/setup.c
diff options
context:
space:
mode:
authorPetr Stehlik <pstehlik@sophics.cz>2008-11-18 21:02:18 +0100
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-03-16 19:10:41 +0100
commit65cd577d5e61043d1c1aec5812dea8a5c834652d (patch)
tree7823e6b01e354717dc5340e6231f48a357a6de9e /arch/m68k/kernel/setup.c
parent93ff9542462ba5074fb6b6cd9e27c4fb04d452ec (diff)
downloadblackbird-op-linux-65cd577d5e61043d1c1aec5812dea8a5c834652d.tar.gz
blackbird-op-linux-65cd577d5e61043d1c1aec5812dea8a5c834652d.zip
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/setup.c')
-rw-r--r--arch/m68k/kernel/setup.c5
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 @@
#ifdef CONFIG_SUN3X
#include <asm/dvma.h>
#endif
+#include <asm/natfeat.h>
#if !FPSTATESIZE || !NR_IRQS
#warning No CPU/platform type selected, your kernel will not work!
@@ -324,6 +325,10 @@ void __init setup_arch(char **cmdline_p)
panic("No configuration setup");
}
+#ifdef CONFIG_NATFEAT
+ nf_init();
+#endif
+
paging_init();
#ifndef CONFIG_SUN3
OpenPOWER on IntegriCloud