diff options
| author | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
|---|---|---|
| committer | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
| commit | e2819e52a162873ff5061de81bb749831bdb5de9 (patch) | |
| tree | 6067ea700202750ba335a423696f2972700e5f76 /arch/sparc64/mm/ultra.S | |
| parent | 17a005074429bbf143e40401f405ae4363e56828 (diff) | |
Merge to 2.1.38.
IMPORTANT NOTE: I could not figure out what information is the
one that should be used for the following files (ie, those
that were in our tree, or those that came from Linus' patch),
please, check these:
include/asm-mips/jazz.h
include/asm-mips/jazzdma.h
include/asm-mips/ioctls.h
Diffstat (limited to 'arch/sparc64/mm/ultra.S')
| -rw-r--r-- | arch/sparc64/mm/ultra.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc64/mm/ultra.S index b11903a25..18f9a363d 100644 --- a/arch/sparc64/mm/ultra.S +++ b/arch/sparc64/mm/ultra.S @@ -1,10 +1,11 @@ -/* $Id: ultra.S,v 1.1 1997/07/18 06:26:55 ralf Exp $ +/* $Id: ultra.S,v 1.9 1997/07/24 12:15:08 davem Exp $ * ultra.S: Don't expand these all over the place... * * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) */ #include <asm/asi.h> +#include <asm/pgtable.h> #include <asm/spitfire.h> /* All callers check mm->context != NO_CONTEXT for us. */ |