diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 08:54:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 08:54:28 -0700 |
| commit | 6ebfc0e20b409f13e62bbb84ce70102b49945cfd (patch) | |
| tree | 67fea9b9c039ba47f96c7d51d8b2959b35543edf /arch/sh/kernel/setup.c | |
| parent | 1e9abb5b1dc90cfcf0e6f1e10f7aaf34d0f33b6b (diff) | |
| parent | fac99d97469e7f91102f97101bea620e5f073196 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fixup __raw_read_trylock().
sh: Kill off remaining config.h references.
sh: Initial gitignore list
sh: build fixes for defconfigs.
sh: Kill off more dead headers.
sh: Set pclk default for SH7705.
sh: defconfig updates.
Diffstat (limited to 'arch/sh/kernel/setup.c')
| -rw-r--r-- | arch/sh/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 77491cf9b25..36d86f9ac38 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -1,5 +1,4 @@ -/* $Id: setup.c,v 1.30 2003/10/13 07:21:19 lethal Exp $ - * +/* * linux/arch/sh/kernel/setup.c * * Copyright (C) 1999 Niibe Yutaka @@ -21,6 +20,7 @@ #include <linux/utsname.h> #include <linux/cpu.h> #include <linux/pfn.h> +#include <linux/fs.h> #include <asm/uaccess.h> #include <asm/io.h> #include <asm/sections.h> |