diff --git a/[refs] b/[refs]
index 6a69e05a576d..2b08f0d3b63f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf5eba53346fbfdf1b80e05ca3fd7fe2ec841077
+refs/heads/master: 2f206701ae9b5c13719c2be26121b9461f05f87c
diff --git a/trunk/drivers/mtd/maps/physmap.c b/trunk/drivers/mtd/maps/physmap.c
index 76ce9bd943aa..bc82f702aa3c 100644
--- a/trunk/drivers/mtd/maps/physmap.c
+++ b/trunk/drivers/mtd/maps/physmap.c
@@ -22,7 +22,6 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <asm/io.h>
-#include <asm/mach/flash.h>
 
 struct physmap_flash_info {
 	struct mtd_info		*mtd;