Index: linux/arch/arm/mach-sa1100/collie.c
===================================================================
--- linux.orig/arch/arm/mach-sa1100/collie.c
+++ linux/arch/arm/mach-sa1100/collie.c
@@ -120,7 +120,7 @@
 }
 
 static struct flash_platform_data collie_flash_data = {
-	.map_name	= "cfi_probe",
+	.map_name	= "sharp",
 	.set_vpp	= collie_set_vpp,
 	.parts		= collie_partitions,
 	.nr_parts	= ARRAY_SIZE(collie_partitions),