#
# Patch managed by http://www.holgerschurig.de/patcher.html
#

--- linux/drivers/mtd/maps/Kconfig~collie_use_sharp_mtd
+++ linux/drivers/mtd/maps/Kconfig
@@ -469,7 +469,7 @@
 
 config MTD_SA1100
 	tristate "CFI Flash device mapped on StrongARM SA11x0"
-	depends on ARM && MTD_CFI && ARCH_SA1100 && MTD_PARTITIONS
+	depends on ARM && (MTD_CFI || MTD_SHARP) && ARCH_SA1100 && MTD_PARTITIONS
 	help
 	  This enables access to the flash chips on most platforms based on
 	  the SA1100 and SA1110, including the Assabet and the Compaq iPAQ.
--- linux/arch/arm/mach-sa1100/collie.c~collie_use_sharp_mtd
+++ linux/arch/arm/mach-sa1100/collie.c
@@ -205,7 +205,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),