git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
fs
/
partitions
/
msdos.c
diff --git
a/fs/partitions/msdos.c
b/fs/partitions/msdos.c
index
ff77a95
..
8f12587
100644
(file)
--- a/
fs/partitions/msdos.c
+++ b/
fs/partitions/msdos.c
@@
-19,7
+19,6
@@
* Re-organised Feb 1998 Russell King
*/
* Re-organised Feb 1998 Russell King
*/
-#include <linux/config.h>
#include "check.h"
#include "msdos.h"
#include "check.h"
#include "msdos.h"
@@
-202,12
+201,12
@@
parse_solaris_x86(struct parsed_partitions *state, struct block_device *bdev,
#endif
}
#endif
}
-#if defined(CONFIG_BSD_DISKLABEL)
|| defined(CONFIG_NEC98_PARTITION)
+#if defined(CONFIG_BSD_DISKLABEL)
/*
* Create devices for BSD partitions listed in a disklabel, under a
* dos-like partition. See parse_extended() for more information.
*/
/*
* Create devices for BSD partitions listed in a disklabel, under a
* dos-like partition. See parse_extended() for more information.
*/
-void
+
static
void
parse_bsd(struct parsed_partitions *state, struct block_device *bdev,
u32 offset, u32 size, int origin, char *flavour,
int max_partitions)
parse_bsd(struct parsed_partitions *state, struct block_device *bdev,
u32 offset, u32 size, int origin, char *flavour,
int max_partitions)
@@
-374,6
+373,7
@@
static struct {
{MINIX_PARTITION, parse_minix},
{UNIXWARE_PARTITION, parse_unixware},
{SOLARIS_X86_PARTITION, parse_solaris_x86},
{MINIX_PARTITION, parse_minix},
{UNIXWARE_PARTITION, parse_unixware},
{SOLARIS_X86_PARTITION, parse_solaris_x86},
+ {NEW_SOLARIS_X86_PARTITION, parse_solaris_x86},
{0, NULL},
};
{0, NULL},
};