diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
| commit | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (patch) | |
| tree | 954a648692e7da983db1d2470953705f6a729264 /fs/partitions | |
| parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) | |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'fs/partitions')
| -rw-r--r-- | fs/partitions/Makefile | 8 | ||||
| -rw-r--r-- | fs/partitions/check.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/fs/partitions/Makefile b/fs/partitions/Makefile index ed64f7c56..e082843c1 100644 --- a/fs/partitions/Makefile +++ b/fs/partitions/Makefile @@ -8,7 +8,10 @@ # Note 2! The CFLAGS definitions are now in the main makefile... O_TARGET := partitions.o -OX_OBJS := check.o + +export-objs := check.o + +obj-y := check.o obj-$(CONFIG_ACORN_PARTITION) += acorn.o obj-$(CONFIG_AMIGA_PARTITION) += amiga.o @@ -21,8 +24,5 @@ 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) - include $(TOPDIR)/Rules.make diff --git a/fs/partitions/check.c b/fs/partitions/check.c index 87b88d04a..53b05e3ef 100644 --- a/fs/partitions/check.c +++ b/fs/partitions/check.c @@ -123,8 +123,8 @@ char *disk_name (struct gendisk *hd, int minor, char *buf) maj = "hd"; break; case MD_MAJOR: - unit -= 'a'-'0'; - break; + sprintf(buf, "%s%d", maj, unit - 'a'); + return buf; } if (hd->major >= SCSI_DISK1_MAJOR && hd->major <= SCSI_DISK7_MAJOR) { unit = unit + (hd->major - SCSI_DISK1_MAJOR + 1) * 16; @@ -408,7 +408,7 @@ void register_disk(struct gendisk *gdev, kdev_t dev, unsigned minors, { if (!gdev) return; - grok_partitions(gdev, MINOR(dev)>>gdev->minor_shift, minors, size); + grok_partitions(gdev, MINOR(dev)>>gdev->minor_shift, minors, size); } void grok_partitions(struct gendisk *dev, int drive, unsigned minors, long size) |