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

diff --cc arch/arm/mach-pxa/corgi.c
index b65be8e7792a4b914918688f6f24539a4d00656c,c5e28a46b2929cc92133073608eaf84606971ca6..a8d91b6c136b8daba787e724a16d725fb8553157
--- 1/arch/arm/mach-pxa/corgi.c
--- 2/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@@ -542,61 -542,42 +543,92 @@@ err_free_1
  static inline void corgi_init_spi(void) {}
  #endif
  
 +static struct mtd_partition sharpsl_nand_partitions[] = {
 +      {
 +              .name = "System Area",
 +              .offset = 0,
 +              .size = 7 * 1024 * 1024,
 +      },
 +      {
 +              .name = "Root Filesystem",
 +              .offset = 7 * 1024 * 1024,
 +              .size = 25 * 1024 * 1024,
 +      },
 +      {
 +              .name = "Home Filesystem",
 +              .offset = MTDPART_OFS_APPEND,
 +              .size = MTDPART_SIZ_FULL,
 +      },
 +};
 +
 +static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
 +
 +static struct nand_bbt_descr sharpsl_bbt = {
 +      .options = 0,
 +      .offs = 4,
 +      .len = 2,
 +      .pattern = scan_ff_pattern
 +};
 +
 +static struct sharpsl_nand_platform_data sharpsl_nand_platform_data = {
 +      .badblock_pattern       = &sharpsl_bbt,
 +      .partitions             = sharpsl_nand_partitions,
 +      .nr_partitions          = ARRAY_SIZE(sharpsl_nand_partitions),
 +};
 +
 +static struct resource sharpsl_nand_resources[] = {
 +      {
 +              .start  = 0x0C000000,
 +              .end    = 0x0C000FFF,
 +              .flags  = IORESOURCE_MEM,
 +      },
 +};
 +
 +static struct platform_device sharpsl_nand_device = {
 +      .name           = "sharpsl-nand",
 +      .id             = -1,
 +      .resource       = sharpsl_nand_resources,
 +      .num_resources  = ARRAY_SIZE(sharpsl_nand_resources),
 +      .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 = {
        &corgiscoop_device,
        &corgifb_device,
        &corgikbd_device,
        &corgiled_device,
 +      &sharpsl_nand_device,
+       &sharpsl_rom_device,
  };
  
  static void corgi_poweroff(void)

diff --cc arch/arm/mach-pxa/poodle.c
index a45afdf252028a25dc8528fe6a09fe471f6ab501,ae88855bf97461b1851b78b0a1c64786740880f1..f9093beba752295a52cac1559b49243da7283d14
--- 1/arch/arm/mach-pxa/poodle.c
--- 2/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@@ -414,59 -414,40 +415,90 @@@ static struct pxafb_mach_info poodle_fb
        .lcd_conn       = LCD_COLOR_TFT_16BPP,
  };
  
 +static struct mtd_partition sharpsl_nand_partitions[] = {
 +      {
 +              .name = "System Area",
 +              .offset = 0,
 +              .size = 7 * 1024 * 1024,
 +      },
 +      {
 +              .name = "Root Filesystem",
 +              .offset = 7 * 1024 * 1024,
 +              .size = 22 * 1024 * 1024,
 +      },
 +      {
 +              .name = "Home Filesystem",
 +              .offset = MTDPART_OFS_APPEND,
 +              .size = MTDPART_SIZ_FULL,
 +      },
 +};
 +
 +static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
 +
 +static struct nand_bbt_descr sharpsl_bbt = {
 +      .options = 0,
 +      .offs = 4,
 +      .len = 2,
 +      .pattern = scan_ff_pattern
 +};
 +
 +static struct sharpsl_nand_platform_data sharpsl_nand_platform_data = {
 +      .badblock_pattern       = &sharpsl_bbt,
 +      .partitions             = sharpsl_nand_partitions,
 +      .nr_partitions          = ARRAY_SIZE(sharpsl_nand_partitions),
 +};
 +
 +static struct resource sharpsl_nand_resources[] = {
 +      {
 +              .start  = 0x0C000000,
 +              .end    = 0x0C000FFF,
 +              .flags  = IORESOURCE_MEM,
 +      },
 +};
 +
 +static struct platform_device sharpsl_nand_device = {
 +      .name           = "sharpsl-nand",
 +      .id             = -1,
 +      .resource       = sharpsl_nand_resources,
 +      .num_resources  = ARRAY_SIZE(sharpsl_nand_resources),
 +      .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)

diff --cc arch/arm/mach-pxa/spitz.c
index 7672b09c31b9f38074704b42d517777c5c905049,7299d87a1cb31f9b33d0ae9deadc2d9e30eab9a3..6d447c9ce8abfcadb2743f11330a48ab93d7d125
--- 1/arch/arm/mach-pxa/spitz.c
--- 2/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@@ -609,60 -613,42 +614,91 @@@ static struct pxafb_mach_info spitz_pxa
        .lcd_conn       = LCD_COLOR_TFT_16BPP | LCD_ALTERNATE_MAPPING,
  };
  
 +static struct mtd_partition sharpsl_nand_partitions[] = {
 +      {
 +              .name = "System Area",
 +              .offset = 0,
 +              .size = 7 * 1024 * 1024,
 +      },
 +      {
 +              .name = "Root Filesystem",
 +              .offset = 7 * 1024 * 1024,
 +      },
 +      {
 +              .name = "Home Filesystem",
 +              .offset = MTDPART_OFS_APPEND,
 +              .size = MTDPART_SIZ_FULL,
 +      },
 +};
 +
 +static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
 +
 +static struct nand_bbt_descr sharpsl_bbt = {
 +      .options = 0,
 +      .offs = 4,
 +      .len = 2,
 +      .pattern = scan_ff_pattern
 +};
 +
 +static struct sharpsl_nand_platform_data sharpsl_nand_platform_data = {
 +      .badblock_pattern       = &sharpsl_bbt,
 +      .partitions             = sharpsl_nand_partitions,
 +      .nr_partitions          = ARRAY_SIZE(sharpsl_nand_partitions),
 +};
 +
 +static struct resource sharpsl_nand_resources[] = {
 +      {
 +              .start  = 0x0C000000,
 +              .end    = 0x0C000FFF,
 +              .flags  = IORESOURCE_MEM,
 +      },
 +};
 +
 +static struct platform_device sharpsl_nand_device = {
 +      .name           = "sharpsl-nand",
 +      .id             = -1,
 +      .resource       = sharpsl_nand_resources,
 +      .num_resources  = ARRAY_SIZE(sharpsl_nand_resources),
 +      .dev.platform_data      = &sharpsl_nand_platform_data,
 +};
 +
  
+ static struct mtd_partition sharpsl_rom_parts[] = {
+       {
+               .name   ="Boot PROM Filesystem",
+               .offset = 0x00140000,
+               .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 = {
        &spitzscoop_device,
        &spitzkbd_device,
        &spitzled_device,
 +      &sharpsl_nand_device,
+       &sharpsl_rom_device,
  };
  
  static void spitz_poweroff(void)

diff --cc drivers/mtd/maps/ixp2000.c
Simple merge

diff --cc drivers/mtd/maps/ixp4xx.c
Simple merge

diff --cc drivers/mtd/onenand/omap2.c
Simple merge

diff --cc drivers/mtd/ubi/build.c
Simple merge