diff options
| author | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 17:24:23 -0400 |
|---|---|---|
| committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 17:24:23 -0400 |
| commit | 05668381140309088443bf5dc53add4104610fbb (patch) | |
| tree | ed53039717390e1a71ff16209281b1f1c8d3e6be /arch/mips/dec/prom/memory.c | |
| parent | 34c162f79e374556dd1384437f0dab558b5dc657 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/sam/kernel/linux-2.6/
Diffstat (limited to 'arch/mips/dec/prom/memory.c')
| -rw-r--r-- | arch/mips/dec/prom/memory.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/dec/prom/memory.c b/arch/mips/dec/prom/memory.c index 1edaf3074ee..3027ce78279 100644 --- a/arch/mips/dec/prom/memory.c +++ b/arch/mips/dec/prom/memory.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | * Copyright (C) 1998 Harald Koerfgen, Frieder Streffer and Paul M. Antoine | 4 | * Copyright (C) 1998 Harald Koerfgen, Frieder Streffer and Paul M. Antoine |
| 5 | * Copyright (C) 2000, 2002 Maciej W. Rozycki | 5 | * Copyright (C) 2000, 2002 Maciej W. Rozycki |
| 6 | */ | 6 | */ |
| 7 | #include <linux/config.h> | ||
| 8 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 9 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 10 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |