--- fs/partitions/acorn.c.old	Fri Dec 21 20:42:32 2001
+++ fs/partitions/acorn.c	Tue Jan  1 21:01:21 2002
@@ -28,8 +28,8 @@
 	extern void xd_set_geometry(kdev_t dev, unsigned char, unsigned char,
 				    unsigned long, unsigned int);
 
-	if (MAJOR(dev) == MFM_ACORN_MAJOR) {
-		unsigned long totalblocks = hd->part[MINOR(dev)].nr_sects;
+	if (major(dev) == MFM_ACORN_MAJOR) {
+		unsigned long totalblocks = hd->part[minor(dev)].nr_sects;
 		xd_set_geometry(dev, secspertrack, heads, totalblocks, 1);
 	}
 #endif
@@ -261,7 +261,7 @@
 	/*
 	 * Work out start of non-adfs partition.
 	 */
-	nr_sects = hd->part[MINOR(to_kdev_t(bdev->bd_dev))].nr_sects - start_sect;
+	nr_sects = hd->part[minor(to_kdev_t(bdev->bd_dev))].nr_sects - start_sect;
 
 	if (start_sect) {
 		first_sector += start_sect;