diff options
| author | Alex deVries <Alex.deVries@windriver.com> | 1999-02-09 22:54:08 +0000 |
|---|---|---|
| committer | Alex deVries <Alex.deVries@windriver.com> | 1999-02-09 22:54:08 +0000 |
| commit | be65d58c136bb149e498e416b4afa55dd0ab99c4 (patch) | |
| tree | bd03f44b827fcf7a55f53ef2fdc8e833bbde14e2 /arch | |
| parent | 145dd02fc9968ebd65307baf0653dc9341dd6bb2 (diff) | |
Modularizing the Newport console driver.
- Alex
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/Makefile | 23 | ||||
| -rw-r--r-- | arch/mips/kernel/mips_ksyms.c | 6 | ||||
| -rw-r--r-- | arch/mips/sgi/kernel/setup.c | 4 |
3 files changed, 9 insertions, 24 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 5935a513e..7de407b66 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -36,7 +36,7 @@ ifdef CONFIG_CROSSCOMPILE CROSS_COMPILE = $(tool-prefix) endif -LINKFLAGS = -static -N +LINKFLAGS = -static MODFLAGS += -mlong-calls # @@ -97,17 +97,6 @@ CORE_FILES += arch/mips/algor/algor.o SUBDIRS += arch/mips/algor #LOADADDR += 0x80000000 endif - -# -# DECstation family -# -ifdef CONFIG_DECSTATION -CORE_FILES += arch/mips/dec/dec.o -SUBDIRS += arch/mips/dec arch/mips/dec/prom -LIBS += arch/mips/dec/prom/rexlib.a -LOADADDR += 0x80040000 -endif - # # Acer PICA 61, Mips Magnum 4000 and Olivetti M700. # @@ -117,14 +106,12 @@ SUBDIRS += arch/mips/jazz arch/mips/arc LIBS += arch/mips/arc/arclib.a LOADADDR += 0x80080000 endif - ifdef CONFIG_SNI_RM200_PCI CORE_FILES += arch/mips/sni/sni.o SUBDIRS += arch/mips/sni arch/mips/arc LIBS += arch/mips/arc/arclib.a LOADADDR += 0x80080000 endif - ifdef CONFIG_SGI LIBS += arch/mips/sgi/kernel/sgikern.a arch/mips/arc/arclib.a SUBDIRS += arch/mips/sgi/kernel arch/mips/arc @@ -138,14 +125,6 @@ HOSTCC = cc endif # -# Baget/MIPS -# -ifdef CONFIG_BAGET_MIPS -SUBDIRS += arch/mips/baget arch/mips/baget/prom -LIBS += arch/mips/baget/baget.a arch/mips/baget/prom/bagetlib.a -endif - -# # Choosing incompatible machines durings configuration will result in # error messages during linking. Select a default linkscript if # none has been choosen above. diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c index 9b2dd1bd9..38bef5f56 100644 --- a/arch/mips/kernel/mips_ksyms.c +++ b/arch/mips/kernel/mips_ksyms.c @@ -1,4 +1,4 @@ -/* $Id: mips_ksyms.c,v 1.12 1999/02/06 03:57:40 adevries Exp $ +/* $Id: mips_ksyms.c,v 1.13 1999/02/07 21:56:32 ulfc Exp $ * * Export MIPS-specific functions needed for loadable modules. * @@ -113,3 +113,7 @@ EXPORT_SYMBOL(register_fpe); EXPORT_SYMBOL(unregister_fpe); #endif +#ifdef CONFIG_VT +EXPORT_SYMBOL(screen_info); +#endif + diff --git a/arch/mips/sgi/kernel/setup.c b/arch/mips/sgi/kernel/setup.c index a1f7a2510..53c1879c1 100644 --- a/arch/mips/sgi/kernel/setup.c +++ b/arch/mips/sgi/kernel/setup.c @@ -1,4 +1,4 @@ -/* $Id: setup.c,v 1.17 1999/01/04 16:03:57 ralf Exp $ +/* $Id: setup.c,v 1.18 1999/01/27 04:50:28 adevries Exp $ * * setup.c: SGI specific setup, including init of the feature struct. * @@ -151,8 +151,10 @@ __initfunc(void sgi_setup(void)) #endif #ifdef CONFIG_VT +#ifdef CONFIG_SGI_NEWPORT_CONSOLE conswitchp = &newport_con; #endif +#endif rtc_ops = &indy_rtc_ops; kbd_ops = &sgi_kbd_ops; #ifdef CONFIG_PSMOUSE |