diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
| commit | 168660f24dfc46c2702acbe4701a446f42a59578 (patch) | |
| tree | f431368afbf6b1b71809cf3fd904d800ea126f4d /fs/partitions | |
| parent | 6420f767924fa73b0ea267864d96820815f4ba5a (diff) | |
Merge with Linux 2.4.0-test5-pre3.
Diffstat (limited to 'fs/partitions')
| -rw-r--r-- | fs/partitions/Makefile | 5 | ||||
| -rw-r--r-- | fs/partitions/msdos.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/fs/partitions/Makefile b/fs/partitions/Makefile index 224af1eba..ed64f7c56 100644 --- a/fs/partitions/Makefile +++ b/fs/partitions/Makefile @@ -19,13 +19,10 @@ obj-$(CONFIG_OSF_PARTITION) += osf.o obj-$(CONFIG_SGI_PARTITION) += sgi.o obj-$(CONFIG_SUN_PARTITION) += sun.o obj-$(CONFIG_ULTRIX_PARTITION) += ultrix.o +obj-$(CONFIG_IBM_PARTITION) += ibm.o O_OBJS += $(obj-y) M_OBJS += $(obj-m) -ifeq ($(CONFIG_IBM_PARTITION),y) -O_OBJS += ibm.o -endif - include $(TOPDIR)/Rules.make diff --git a/fs/partitions/msdos.c b/fs/partitions/msdos.c index 8db218b2d..69f6f0ce9 100644 --- a/fs/partitions/msdos.c +++ b/fs/partitions/msdos.c @@ -136,6 +136,12 @@ static void extended_partition(struct gendisk *hd, kdev_t dev) add_gd_partition(hd, current_minor, this_sector+START_SECT(p)*sector_size, NR_SECTS(p)*sector_size); +#if CONFIG_BLK_DEV_MD && CONFIG_AUTODETECT_RAID + if (SYS_IND(p) == LINUX_RAID_PARTITION) { + md_autodetect_dev(MKDEV(hd->major,current_minor)); + } +#endif + current_minor++; loopct = 0; if ((current_minor & mask) == 0) |