diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
| commit | 9f9f3e6e8548a596697778337110a423c384b6f3 (patch) | |
| tree | 5dd4b290ef532cf5ecb058e1a92cd3435afeac8c /arch/mips/arc/memory.c | |
| parent | d5c9a365ee7d2fded249aa5abfc5e89587583029 (diff) | |
Merge with Linux 2.3.49.
Diffstat (limited to 'arch/mips/arc/memory.c')
| -rw-r--r-- | arch/mips/arc/memory.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/arc/memory.c b/arch/mips/arc/memory.c index 4582297c2..d1c530fda 100644 --- a/arch/mips/arc/memory.c +++ b/arch/mips/arc/memory.c @@ -4,7 +4,7 @@ * * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * - * $Id: memory.c,v 1.9 2000/01/27 01:05:23 ralf Exp $ + * $Id: memory.c,v 1.10 2000/01/27 23:21:57 ralf Exp $ */ #include <linux/init.h> #include <linux/kernel.h> @@ -13,7 +13,6 @@ #include <linux/mm.h> #include <linux/bootmem.h> #include <linux/swap.h> -#include <linux/config.h> #include <asm/sgialib.h> #include <asm/page.h> |