From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 9 Sep 2011 03:27:37 +0000 (+1000)
Subject: Merge remote-tracking branch 'l2-mtd/master'
X-Git-Tag: next-20110909~52
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=86b3c7db77ea2c54cfc41379437c62e09fb3e6b9;p=karo-tx-linux.git

Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
	arch/arm/mach-at91/board-usb-a9260.c
	drivers/mtd/maps/lantiq-flash.c
---

86b3c7db77ea2c54cfc41379437c62e09fb3e6b9
diff --cc arch/arm/mach-at91/board-usb-a926x.c
index e6842ad4e25e,909fd9743950..6221f59a219d
--- a/arch/arm/mach-at91/board-usb-a926x.c
+++ b/arch/arm/mach-at91/board-usb-a926x.c
@@@ -202,10 -123,11 +196,11 @@@ static struct atmel_nand_data __initdat
  //	.det_pin	= ... not connected
  	.rdy_pin	= AT91_PIN_PA22,
  	.enable_pin	= AT91_PIN_PD15,
- 	.partition_info	= nand_partitions,
+ 	.parts		= ek_nand_partition,
+ 	.num_parts	= ARRAY_SIZE(ek_nand_partition),
  };
  
 -static struct sam9_smc_config __initdata ek_nand_smc_config = {
 +static struct sam9_smc_config __initdata usb_a9260_nand_smc_config = {
  	.ncs_read_setup		= 0,
  	.nrd_setup		= 1,
  	.ncs_write_setup	= 0,