diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
| commit | 3797ba0b62debb71af4606910acacc9896a9ae3b (patch) | |
| tree | 414eea76253c7871bfdf3bd9d1817771eb40917c /arch/sparc/kernel/ioport.c | |
| parent | 2b6c0c580795a4404f72d2a794214dd9e080709d (diff) | |
Merge with Linux 2.4.0-test2.
Diffstat (limited to 'arch/sparc/kernel/ioport.c')
| -rw-r--r-- | arch/sparc/kernel/ioport.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index 71f5dbc88..ca81aa872 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c @@ -1,4 +1,4 @@ -/* $Id: ioport.c,v 1.38 2000/06/04 06:23:52 anton Exp $ +/* $Id: ioport.c,v 1.39 2000/06/20 01:10:00 anton Exp $ * ioport.c: Simple io mapping allocator. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -43,6 +43,8 @@ #include <asm/pgalloc.h> #include <asm/pgtable.h> +#define mmu_inval_dma_area(p, l) /* Anton pulled it out for 2.4.0-xx */ + struct resource *_sparc_find_resource(struct resource *r, unsigned long); static void *_sparc_ioremap(struct resource *res, u32 bus, u32 pa, int sz); |