linux-next: manual merge of the l2-mtd tree with the at91 tree

[Stephen Rothwell]

Hi Artem,

Today's linux-next merge of the l2-mtd tree got conflicts in
arch/arm/mach-at91/board-afeb-9260v1.c,
arch/arm/mach-at91/board-neocore926.c. arch/arm/mach-at91/board-rm9200dk.c,
arch/arm/mach-at91/board-sam9g20ek.c and
arch/arm/mach-at91/board-sam9m10g45ek.c between commit 36706ab70b26
("ARM: at91/boards: use -EINVAL for invalid gpio") from the at91 tree and
commit 1754aab9bb86 ("mtd: ATMEL, AVR32: inline nand partition table
access") from the l2-mtd tree.

Just context changes.  I fixed them up (see below) and can carry the
fixes as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-at91/board-afeb-9260v1.c
index 2d92043,a053e91..0000000
--- a/arch/arm/mach-at91/board-afeb-9260v1.c
+++ b/arch/arm/mach-at91/board-afeb-9260v1.c
@@@ -142,9 -135,9 +136,10 @@@ static struct atmel_nand_data __initdat
  	.cle		= 22,
  	.rdy_pin	= AT91_PIN_PC13,
  	.enable_pin	= AT91_PIN_PC14,
- 	.partition_info	= nand_partitions,
  	.bus_width_16	= 0,
 +	.det_pin	= -EINVAL,
+ 	.parts		= afeb9260_nand_partition,
+ 	.num_parts	= ARRAY_SIZE(afeb9260_nand_partition),
  };
  
  
diff --cc arch/arm/mach-at91/board-neocore926.c
index 0e6b86e,60f0cee..0000000
--- a/arch/arm/mach-at91/board-neocore926.c
+++ b/arch/arm/mach-at91/board-neocore926.c
@@@ -195,8 -188,8 +189,9 @@@ static struct atmel_nand_data __initdat
  	.rdy_pin		= AT91_PIN_PB19,
  	.rdy_pin_active_low	= 1,
  	.enable_pin		= AT91_PIN_PD15,
- 	.partition_info		= nand_partitions,
 +	.det_pin		= -EINVAL,
+ 	.parts			= neocore926_nand_partition,
+ 	.num_parts		= ARRAY_SIZE(neocore926_nand_partition),
  };
  
  static struct sam9_smc_config __initdata neocore926_nand_smc_config = {
diff --cc arch/arm/mach-at91/board-rm9200dk.c
index e34e84e,b5f2faf..0000000
--- a/arch/arm/mach-at91/board-rm9200dk.c
+++ b/arch/arm/mach-at91/board-rm9200dk.c
@@@ -153,8 -143,9 +147,9 @@@ static struct atmel_nand_data __initdat
  	.cle		= 21,
  	.det_pin	= AT91_PIN_PB1,
  	.rdy_pin	= AT91_PIN_PC2,
 -	// .enable_pin	= ... not there
 +	.enable_pin	= -EINVAL,
- 	.partition_info	= nand_partitions,
+ 	.parts		= dk_nand_partition,
+ 	.num_parts	= ARRAY_SIZE(dk_nand_partition),
  };
  
  #define DK_FLASH_BASE	AT91_CHIPSELECT_0
diff --cc arch/arm/mach-at91/board-sam9g20ek.c
index 757d74f,0031227..0000000
--- a/arch/arm/mach-at91/board-sam9g20ek.c
+++ b/arch/arm/mach-at91/board-sam9g20ek.c
@@@ -170,8 -163,8 +164,9 @@@ static struct atmel_nand_data __initdat
  	.cle		= 22,
  	.rdy_pin	= AT91_PIN_PC13,
  	.enable_pin	= AT91_PIN_PC14,
- 	.partition_info	= nand_partitions,
 +	.det_pin	= -EINVAL,
+ 	.parts		= ek_nand_partition,
+ 	.num_parts	= ARRAY_SIZE(ek_nand_partition),
  };
  
  static struct sam9_smc_config __initdata ek_nand_smc_config = {
diff --cc arch/arm/mach-at91/board-sam9m10g45ek.c
index e3694b1,00d041c..0000000
--- a/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@@ -150,8 -143,8 +144,9 @@@ static struct atmel_nand_data __initdat
  	.cle		= 22,
  	.rdy_pin	= AT91_PIN_PC8,
  	.enable_pin	= AT91_PIN_PC14,
- 	.partition_info	= nand_partitions,
 +	.det_pin	= -EINVAL,
+ 	.parts		= ek_nand_partition,
+ 	.num_parts	= ARRAY_SIZE(ek_nand_partition),
  };
  
  static struct sam9_smc_config __initdata ek_nand_smc_config = {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/