diff options
-rw-r--r-- | fs/partitions/Makefile | 1 | ||||
-rw-r--r-- | fs/partitions/check.c | 3 | ||||
-rw-r--r-- | fs/partitions/check.h | 4 | ||||
-rw-r--r-- | fs/partitions/msdos.c | 4 |
4 files changed, 2 insertions, 10 deletions
diff --git a/fs/partitions/Makefile b/fs/partitions/Makefile index 4c83c17969e1..66d5cc26fafb 100644 --- a/fs/partitions/Makefile +++ b/fs/partitions/Makefile | |||
@@ -17,4 +17,3 @@ obj-$(CONFIG_SUN_PARTITION) += sun.o | |||
17 | obj-$(CONFIG_ULTRIX_PARTITION) += ultrix.o | 17 | obj-$(CONFIG_ULTRIX_PARTITION) += ultrix.o |
18 | obj-$(CONFIG_IBM_PARTITION) += ibm.o | 18 | obj-$(CONFIG_IBM_PARTITION) += ibm.o |
19 | obj-$(CONFIG_EFI_PARTITION) += efi.o | 19 | obj-$(CONFIG_EFI_PARTITION) += efi.o |
20 | obj-$(CONFIG_NEC98_PARTITION) += nec98.o msdos.o | ||
diff --git a/fs/partitions/check.c b/fs/partitions/check.c index 2cab98a9a621..77e178f13162 100644 --- a/fs/partitions/check.c +++ b/fs/partitions/check.c | |||
@@ -79,9 +79,6 @@ static int (*check_part[])(struct parsed_partitions *, struct block_device *) = | |||
79 | #ifdef CONFIG_LDM_PARTITION | 79 | #ifdef CONFIG_LDM_PARTITION |
80 | ldm_partition, /* this must come before msdos */ | 80 | ldm_partition, /* this must come before msdos */ |
81 | #endif | 81 | #endif |
82 | #ifdef CONFIG_NEC98_PARTITION | ||
83 | nec98_partition, /* must be come before `msdos_partition' */ | ||
84 | #endif | ||
85 | #ifdef CONFIG_MSDOS_PARTITION | 82 | #ifdef CONFIG_MSDOS_PARTITION |
86 | msdos_partition, | 83 | msdos_partition, |
87 | #endif | 84 | #endif |
diff --git a/fs/partitions/check.h b/fs/partitions/check.h index 43adcc68e471..17ae8ecd9e8b 100644 --- a/fs/partitions/check.h +++ b/fs/partitions/check.h | |||
@@ -30,7 +30,3 @@ put_partition(struct parsed_partitions *p, int n, sector_t from, sector_t size) | |||
30 | 30 | ||
31 | extern int warn_no_part; | 31 | extern int warn_no_part; |
32 | 32 | ||
33 | extern void parse_bsd(struct parsed_partitions *state, | ||
34 | struct block_device *bdev, u32 offset, u32 size, | ||
35 | int origin, char *flavour, int max_partitions); | ||
36 | |||
diff --git a/fs/partitions/msdos.c b/fs/partitions/msdos.c index 584a27b2bbd5..9935d254186e 100644 --- a/fs/partitions/msdos.c +++ b/fs/partitions/msdos.c | |||
@@ -202,12 +202,12 @@ parse_solaris_x86(struct parsed_partitions *state, struct block_device *bdev, | |||
202 | #endif | 202 | #endif |
203 | } | 203 | } |
204 | 204 | ||
205 | #if defined(CONFIG_BSD_DISKLABEL) || defined(CONFIG_NEC98_PARTITION) | 205 | #if defined(CONFIG_BSD_DISKLABEL) |
206 | /* | 206 | /* |
207 | * Create devices for BSD partitions listed in a disklabel, under a | 207 | * Create devices for BSD partitions listed in a disklabel, under a |
208 | * dos-like partition. See parse_extended() for more information. | 208 | * dos-like partition. See parse_extended() for more information. |
209 | */ | 209 | */ |
210 | void | 210 | static void |
211 | parse_bsd(struct parsed_partitions *state, struct block_device *bdev, | 211 | parse_bsd(struct parsed_partitions *state, struct block_device *bdev, |
212 | u32 offset, u32 size, int origin, char *flavour, | 212 | u32 offset, u32 size, int origin, char *flavour, |
213 | int max_partitions) | 213 | int max_partitions) |