diff --git a/[refs] b/[refs]
index 4c9acdb1ef3f..521a1c9cba57 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 266a813c083d67886d89f1066ea6355857b51f83
+refs/heads/master: 6722e45c2de622eaf5f26d370b9de19632ac7478
diff --git a/trunk/fs/partitions/acorn.c b/trunk/fs/partitions/acorn.c
index 3d3e16631472..a97b477ac0fc 100644
--- a/trunk/fs/partitions/acorn.c
+++ b/trunk/fs/partitions/acorn.c
@@ -275,16 +275,6 @@ adfspart_check_ADFS(struct parsed_partitions *state, struct block_device *bdev)
 	id = data[0x1fc] & 15;
 	put_dev_sector(sect);
 
-#ifdef CONFIG_BLK_DEV_MFM
-	if (MAJOR(bdev->bd_dev) == MFM_ACORN_MAJOR) {
-		extern void xd_set_geometry(struct block_device *,
-			unsigned char, unsigned char, unsigned int);
-		xd_set_geometry(bdev, dr->secspertrack, heads, 1);
-		invalidate_bh_lrus();
-		truncate_inode_pages(bdev->bd_inode->i_mapping, 0);
-	}
-#endif
-
 	/*
 	 * Work out start of non-adfs partition.
 	 */