Commit 486fd404 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

[PATCH] small partitions/msdos cleanups

This patch makes the following changes to the msdos partition code:
- remove CONFIG_NEC98_PARTITION leftovers
- make parse_bsd static

This patch was already ACK'ed by Andries Brouwer.
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 40086ea1
...@@ -17,4 +17,3 @@ obj-$(CONFIG_SUN_PARTITION) += sun.o ...@@ -17,4 +17,3 @@ obj-$(CONFIG_SUN_PARTITION) += sun.o
obj-$(CONFIG_ULTRIX_PARTITION) += ultrix.o obj-$(CONFIG_ULTRIX_PARTITION) += ultrix.o
obj-$(CONFIG_IBM_PARTITION) += ibm.o obj-$(CONFIG_IBM_PARTITION) += ibm.o
obj-$(CONFIG_EFI_PARTITION) += efi.o obj-$(CONFIG_EFI_PARTITION) += efi.o
obj-$(CONFIG_NEC98_PARTITION) += nec98.o msdos.o
...@@ -79,9 +79,6 @@ static int (*check_part[])(struct parsed_partitions *, struct block_device *) = ...@@ -79,9 +79,6 @@ static int (*check_part[])(struct parsed_partitions *, struct block_device *) =
#ifdef CONFIG_LDM_PARTITION #ifdef CONFIG_LDM_PARTITION
ldm_partition, /* this must come before msdos */ ldm_partition, /* this must come before msdos */
#endif #endif
#ifdef CONFIG_NEC98_PARTITION
nec98_partition, /* must be come before `msdos_partition' */
#endif
#ifdef CONFIG_MSDOS_PARTITION #ifdef CONFIG_MSDOS_PARTITION
msdos_partition, msdos_partition,
#endif #endif
......
...@@ -30,7 +30,3 @@ put_partition(struct parsed_partitions *p, int n, sector_t from, sector_t size) ...@@ -30,7 +30,3 @@ put_partition(struct parsed_partitions *p, int n, sector_t from, sector_t size)
extern int warn_no_part; extern int warn_no_part;
extern void parse_bsd(struct parsed_partitions *state,
struct block_device *bdev, u32 offset, u32 size,
int origin, char *flavour, int max_partitions);
...@@ -202,12 +202,12 @@ parse_solaris_x86(struct parsed_partitions *state, struct block_device *bdev, ...@@ -202,12 +202,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 * Create devices for BSD partitions listed in a disklabel, under a
* dos-like partition. See parse_extended() for more information. * dos-like partition. See parse_extended() for more information.
*/ */
void static void
parse_bsd(struct parsed_partitions *state, struct block_device *bdev, parse_bsd(struct parsed_partitions *state, struct block_device *bdev,
u32 offset, u32 size, int origin, char *flavour, u32 offset, u32 size, int origin, char *flavour,
int max_partitions) int max_partitions)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment