diff options
author | Harald Koerfgen <hkoerfg@web.de> | 1999-10-17 19:55:22 +0000 |
---|---|---|
committer | Harald Koerfgen <hkoerfg@web.de> | 1999-10-17 19:55:22 +0000 |
commit | 929e0befd2cc9e36339bd8da47ad552192e61545 (patch) | |
tree | 2d312a0358539fd1c06f4c5ec509e5b09a746466 /arch | |
parent | f20726c6656eb8412fafe93d7e42bef64819bb99 (diff) |
Some minor bugfixes:
o Fix braino in lib/Makefile
o Export __wbflush() and release_tc_card() for modules
o DMA isn't limited on DECstations
o remove elf2ecoff and addinitrd while "make clean"
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/boot/Makefile | 4 | ||||
-rw-r--r-- | arch/mips/dec/Makefile | 8 | ||||
-rw-r--r-- | arch/mips/dec/wbflush.c | 6 | ||||
-rw-r--r-- | arch/mips/lib/Makefile | 8 |
4 files changed, 20 insertions, 6 deletions
diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile index 63af5fc70..1ae3a3fd6 100644 --- a/arch/mips/boot/Makefile +++ b/arch/mips/boot/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.8 1999/03/13 12:36:50 tsbogend Exp $ +# $Id: Makefile,v 1.9 1999/04/07 18:45:23 harald Exp $ # # This file is subject to the terms and conditions of the GNU General Public # License. See the file "COPYING" in the main directory of this archive @@ -46,6 +46,8 @@ dep: clean: rm -f vmlinux.ecoff + rm -f addinitrd + rm -f elf2ecoff dummy: diff --git a/arch/mips/dec/Makefile b/arch/mips/dec/Makefile index 0d23b8fbd..d3f65947a 100644 --- a/arch/mips/dec/Makefile +++ b/arch/mips/dec/Makefile @@ -13,7 +13,7 @@ all: dec.o O_TARGET := dec.o -O_OBJS := int-handler.o setup.o irq.o time.o reset.o rtc-dec.o wbflush.o +O_OBJS := int-handler.o setup.o irq.o time.o reset.o rtc-dec.o ifdef CONFIG_PROM_CONSOLE O_OBJS += promcon.o @@ -23,6 +23,12 @@ ifdef CONFIG_SERIAL O_OBJS += serial.o endif +ifeq ($(CONFIG_MODULES),y) + OX_OBJS = wbflush.o +else + O_OBJS += wbflush.o +endif + int-handler.o: int-handler.S clean: diff --git a/arch/mips/dec/wbflush.c b/arch/mips/dec/wbflush.c index 516a4ad2b..b1f9d3286 100644 --- a/arch/mips/dec/wbflush.c +++ b/arch/mips/dec/wbflush.c @@ -102,3 +102,9 @@ static void wbflush_kn02ba(void) static void wbflush_kn03(void) { } + +#ifdef EXPORT_SYMTAB +#include <linux/module.h> + +EXPORT_SYMBOL(__wbflush); +#endif diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile index 9e2128b49..59c711647 100644 --- a/arch/mips/lib/Makefile +++ b/arch/mips/lib/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.9 1999/01/04 16:03:50 ralf Exp $ +# $Id: Makefile,v 1.10 1999/10/12 17:33:49 harald Exp $ # # Makefile for MIPS-specific library files.. # @@ -13,10 +13,10 @@ L_OBJS = csum_partial.o csum_partial_copy.o floppy-std.o \ floppy-no.o ide-std.o ide-no.o kbd-std.o kbd-no.o rtc-std.o \ rtc-no.o memset.o memcpy.o strlen_user.o strncpy_user.o watch.o -#ifdef CONFIG_CPU_R3000 +ifdef CONFIG_CPU_R3000 L_OBJS += r3k_dump_tlb.o -#else +else L_OBJS += dump_tlb.o -#endif +endif include $(TOPDIR)/Rules.make |