--- 2.3.99-pre3aa1-alpha/fs/partitions/msdos.c.~1~ Mon Mar 27 22:44:49 2000 +++ 2.3.99-pre3aa1-alpha/fs/partitions/msdos.c Thu Mar 30 20:27:17 2000 @@ -27,9 +27,9 @@ #include #include -#ifdef CONFIG_IDE +#ifdef CONFIG_BLK_DEV_IDE #include /* IDE xlate */ -#endif /* CONFIG_IDE */ +#endif /* CONFIG_BLK_DEV_IDE */ #include @@ -350,19 +350,19 @@ unsigned char *data; int mask = (1 << hd->minor_shift) - 1; int sector_size = get_hardsect_size(dev) / 512; -#ifdef CONFIG_IDE +#ifdef CONFIG_BLK_DEV_IDE int tested_for_xlate = 0; read_mbr: -#endif /* CONFIG_IDE */ +#endif /* CONFIG_BLK_DEV_IDE */ 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_IDE +#ifdef CONFIG_BLK_DEV_IDE check_table: -#endif /* CONFIG_IDE */ +#endif /* CONFIG_BLK_DEV_IDE */ /* Use bforget(), because we may have changed the disk geometry */ if (*(unsigned short *) (0x1fe + data) != cpu_to_le16(MSDOS_LABEL_MAGIC)) { bforget(bh); @@ -370,7 +370,7 @@ } p = (struct partition *) (0x1be + data); -#ifdef CONFIG_IDE +#ifdef CONFIG_BLK_DEV_IDE if (!tested_for_xlate++) { /* Do this only once per disk */ /* * Look for various forms of IDE disk geometry translation @@ -426,7 +426,7 @@ (void) ide_xlate_1024(dev, 2, heads, " [PTBL]"); } } -#endif /* CONFIG_IDE */ +#endif /* CONFIG_BLK_DEV_IDE */ /* Look for partitions in two passes: First find the primary partitions, and the DOS-type extended partitions.