diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-23 02:25:38 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-23 02:25:38 +0000 |
| commit | 16b5d462f73eb29d1f67fa01cc1ea66afdc72569 (patch) | |
| tree | 5407bd573f4840e473ea27cbe61e5c7a07131fcd /fs/partitions | |
| parent | ce8a076e11e7e5ee36007f9a3eee5bb3744cb8f6 (diff) | |
Merge with Linux 2.3.99-pre2.
Diffstat (limited to 'fs/partitions')
| -rw-r--r-- | fs/partitions/acorn.c | 4 | ||||
| -rw-r--r-- | fs/partitions/msdos.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/fs/partitions/acorn.c b/fs/partitions/acorn.c index 856cc30aa..561c87065 100644 --- a/fs/partitions/acorn.c +++ b/fs/partitions/acorn.c @@ -98,7 +98,7 @@ static int riscix_partition(struct gendisk *hd, kdev_t dev, unsigned long first_ } } - printk(" >"); + printk(" >\n"); if (hd->part[riscix_minor].nr_sects > 2) hd->part[riscix_minor].nr_sects = 2; @@ -139,7 +139,7 @@ static int linux_partition(struct gendisk *hd, kdev_t dev, unsigned long first_s le32_to_cpu(linuxp->nr_sects)); linuxp ++; } - printk(" >"); + printk(" >\n"); /* * Prevent someone doing a mkswap or mkfs on this partition */ diff --git a/fs/partitions/msdos.c b/fs/partitions/msdos.c index 2f315ccd9..fc9555b77 100644 --- a/fs/partitions/msdos.c +++ b/fs/partitions/msdos.c @@ -347,19 +347,19 @@ int msdos_partition(struct gendisk *hd, kdev_t dev, unsigned char *data; int mask = (1 << hd->minor_shift) - 1; int sector_size = get_hardsect_size(dev) / 512; -#ifdef CONFIG_BLK_DEV_IDE +#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) int tested_for_xlate = 0; read_mbr: -#endif /* CONFIG_BLK_DEV_IDE */ +#endif /* (CONFIG_BLK_DEV_IDE) || (CONFIG_BLK_DEV_IDE_MODULE) */ if (!(bh = bread(dev,0,get_ptable_blocksize(dev)))) { if (warn_no_part) printk(" unable to read partition table\n"); return -1; } data = bh->b_data; -#ifdef CONFIG_BLK_DEV_IDE +#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) check_table: -#endif /* CONFIG_BLK_DEV_IDE */ +#endif /* (CONFIG_BLK_DEV_IDE) || (CONFIG_BLK_DEV_IDE_MODULE) */ /* Use bforget(), because we may have changed the disk geometry */ if (*(unsigned short *) (0x1fe + data) != cpu_to_le16(MSDOS_LABEL_MAGIC)) { bforget(bh); @@ -367,7 +367,7 @@ check_table: } p = (struct partition *) (0x1be + data); -#ifdef CONFIG_BLK_DEV_IDE +#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) if (!tested_for_xlate++) { /* Do this only once per disk */ /* * Look for various forms of IDE disk geometry translation @@ -423,7 +423,7 @@ check_table: (void) ide_xlate_1024(dev, 2, heads, " [PTBL]"); } } -#endif /* CONFIG_BLK_DEV_IDE */ +#endif /* (CONFIG_BLK_DEV_IDE) || (CONFIG_BLK_DEV_IDE_MODULE) */ /* Look for partitions in two passes: First find the primary partitions, and the DOS-type extended partitions. |