Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	arch/arm/mach-pxa/corgi.c
	arch/arm/mach-pxa/poodle.c
	arch/arm/mach-pxa/spitz.c

1 files changed, 32 insertions, 0 deletions

diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index a45afdf25202..f9093beba752 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -20,6 +20,7 @@
 #include <linux/fb.h>
 #include <linux/pm.h>
 #include <linux/delay.h>
+#include <linux/mtd/physmap.h>
 #include <linux/gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
@@ -463,10 +464,41 @@ static struct platform_device sharpsl_nand_device = {
         .dev.platform_data      = &sharpsl_nand_platform_data,
 };
 
+static struct mtd_partition sharpsl_rom_parts[] = {
+        {
+                .name   ="Boot PROM Filesystem",
+                .offset = 0x00120000,
+                .size   = MTDPART_SIZ_FULL,
+        },
+};
+
+static struct physmap_flash_data sharpsl_rom_data = {
+        .width          = 2,
+        .nr_parts       = ARRAY_SIZE(sharpsl_rom_parts),
+        .parts          = sharpsl_rom_parts,
+};
+
+static struct resource sharpsl_rom_resources[] = {
+        {
+                .start  = 0x00000000,
+                .end    = 0x007fffff,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device sharpsl_rom_device = {
+        .name   = "physmap-flash",
+        .id     = -1,
+        .resource = sharpsl_rom_resources,
+        .num_resources = ARRAY_SIZE(sharpsl_rom_resources),
+        .dev.platform_data = &sharpsl_rom_data,
+};
+
 static struct platform_device *devices[] __initdata = {
         &poodle_locomo_device,
         &poodle_scoop_device,
         &sharpsl_nand_device,
+        &sharpsl_rom_device,
 };
 
 static void poodle_poweroff(void)