diff --git a/[refs] b/[refs]
index c99c9c36a480..c9b8a52ccea1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b99238721bf62c216d556b4ba63bdf410e068284
+refs/heads/master: 38160e0b0126565947e986701ae1bdbff01f121d
diff --git a/trunk/arch/arm/mach-mx3/mx31lilly.c b/trunk/arch/arm/mach-mx3/mx31lilly.c
index e5339341c0ba..f15a2eb7bd8b 100644
--- a/trunk/arch/arm/mach-mx3/mx31lilly.c
+++ b/trunk/arch/arm/mach-mx3/mx31lilly.c
@@ -30,6 +30,7 @@
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/smsc911x.h>
+#include <linux/mtd/physmap.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -83,8 +84,30 @@ static struct platform_device smsc91x_device = {
 	}
 };
 
+/* NOR flash */
+static struct physmap_flash_data nor_flash_data = {
+	.width  = 2,
+};
+
+static struct resource nor_flash_resource = {
+	.start	= 0xa0000000,
+	.end	= 0xa1ffffff,
+	.flags	= IORESOURCE_MEM,
+};
+
+static struct platform_device physmap_flash_device = {
+	.name	= "physmap-flash",
+	.id	= 0,
+	.dev	= {
+		.platform_data  = &nor_flash_data,
+	},
+	.resource = &nor_flash_resource,
+	.num_resources = 1,
+};
+
 static struct platform_device *devices[] __initdata = {
 	&smsc91x_device,
+	&physmap_flash_device,
 };
 
 static int mx31lilly_baseboard;