diff --git a/[refs] b/[refs]
index 261cb459f693..1d60a5f963b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d15057b7034d9fdc4259b66a0367c9d8ffcf0620
+refs/heads/master: 241651d04d672fb685b2874707016cbbf95931e5
diff --git a/trunk/include/linux/mtd/cfi.h b/trunk/include/linux/mtd/cfi.h
index 123948b14547..e17c5343cf51 100644
--- a/trunk/include/linux/mtd/cfi.h
+++ b/trunk/include/linux/mtd/cfi.h
@@ -57,6 +57,15 @@
 #define cfi_interleave_is_8(cfi) (0)
 #endif
 
+#ifndef cfi_interleave
+#warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work.
+static inline int cfi_interleave(void *cfi)
+{
+	BUG();
+	return 0;
+}
+#endif
+
 static inline int cfi_interleave_supported(int i)
 {
 	switch (i) {
diff --git a/trunk/include/linux/mtd/map.h b/trunk/include/linux/mtd/map.h
index 81f3a314dd76..a9fae032ba81 100644
--- a/trunk/include/linux/mtd/map.h
+++ b/trunk/include/linux/mtd/map.h
@@ -125,7 +125,15 @@
 #endif
 
 #ifndef map_bankwidth
-#error "No bus width supported. What's the point?"
+#warning "No CONFIG_MTD_MAP_BANK_WIDTH_xx selected. No NOR chip support can work"
+static inline int map_bankwidth(void *map)
+{
+	BUG();
+	return 0;
+}
+#define map_bankwidth_is_large(map) (0)
+#define map_words(map) (0)
+#define MAX_MAP_BANKWIDTH 1
 #endif
 
 static inline int map_bankwidth_supported(int w)