diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-25 20:26:59 +0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-25 20:26:59 +0400 |
| commit | 363e065c02b1273364d5356711a83e7f548fc0c8 (patch) | |
| tree | 0df0e65da403ade33ade580c2770c97437b1b1af /fs/openpromfs/inode.c | |
| parent | 907b9bceb41fa46beae93f79cc4a2247df502c0f (diff) | |
| parent | 7c250413e5b7c3dfae89354725b70c76d7621395 (diff) | |
| download | linux-363e065c02b1273364d5356711a83e7f548fc0c8.tar.xz | |
[GFS2] Fix up merge of Linus' kernel into GFS2
This fixes up a couple of conflicts when merging up with
Linus' latest kernel. This will hopefully allow GFS2 to
be more easily merged into forthcoming -mm and FC kernels
due to the "one line per header" format now used for the
kernel headers.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Conflicts:
include/linux/Kbuild
include/linux/kernel.h
Diffstat (limited to 'fs/openpromfs/inode.c')
| -rw-r--r-- | fs/openpromfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c index 93a56bd4a2b7..592a6402e851 100644 --- a/fs/openpromfs/inode.c +++ b/fs/openpromfs/inode.c @@ -8,10 +8,10 @@ #include <linux/types.h> #include <linux/string.h> #include <linux/fs.h> -#include <linux/openprom_fs.h> #include <linux/init.h> #include <linux/slab.h> #include <linux/seq_file.h> +#include <linux/magic.h> #include <asm/openprom.h> #include <asm/oplib.h> |