--- zzzz-none-000/linux-2.6.19.2/drivers/mtd/maps/physmap.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/mtd/maps/physmap.c	2007-05-08 12:32:35.000000000 +0000
@@ -142,6 +142,14 @@
 		return 0;
 	}
 
+    if (physmap_data->probes) {
+        err = parse_mtd_partitions(info->mtd, physmap_data->probes, &info->parts, 0);
+        if (err > 0) {
+            add_mtd_partitions(info->mtd, info->parts, err);
+            return 0;
+        }
+    }
+
 	if (physmap_data->nr_parts) {
 		printk(KERN_NOTICE "Using physmap partition information\n");
 		add_mtd_partitions(info->mtd, physmap_data->parts,
@@ -202,8 +210,10 @@
 
 #ifdef CONFIG_MTD_PHYSMAP_LEN
 #if CONFIG_MTD_PHYSMAP_LEN != 0
+#ifndef CONFIG_ARCH_DAVINCI
 #warning using PHYSMAP compat code
 #define PHYSMAP_COMPAT
+#endif /*--- #ifndef CONFIG_ARCH_DAVINCI ---*/
 #endif
 #endif