patch-1.3.10 linux/drivers/block/genhd.c

Next file: linux/drivers/char/selection.c
Previous file: linux/drivers/block/cdu31a.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.9/linux/drivers/block/genhd.c linux/drivers/block/genhd.c
@@ -114,7 +114,9 @@
 	struct buffer_head *bh;
 	struct partition *p;
 	int mask = (1 << hd->minor_shift) - 1;
+#ifdef CONFIG_BLK_DEV_IDE
 	extern void ide_xlate_1024(dev_t);
+#endif
 
 read_mbr:
 	if (!(bh = bread(dev,0,1024))) {
@@ -149,7 +151,9 @@
 		first_sector                    += p->end_sector;
 		hd->part[MINOR(dev)].start_sect += p->end_sector;
 		hd->part[MINOR(dev)].nr_sects   -= p->end_sector;
+#ifdef CONFIG_BLK_DEV_IDE
 		ide_xlate_1024(dev);	/* harmless if not an IDE drive */
+#endif
 		bh->b_dirt = 0;		/* prevent re-use of this block */
 		bh->b_uptodate = 0;
 		bh->b_req = 0;
@@ -162,7 +166,9 @@
 	 */
 	if (p->sys_ind == DM6_AUXPARTITION) {
 		printk(" [DM6]");
+#ifdef CONFIG_BLK_DEV_IDE
 		ide_xlate_1024(dev);	/* harmless if not an IDE drive */
+#endif
 	}
 
 	current_minor += 4;  /* first "extra" minor (for extended partitions) */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this