linux-next: manual merge of the i.MX tree with the arm tree

[Stephen Rothwell]

Hi Sascha,

Today's linux-next merge of the i.MX tree got a conflict in
arch/arm/mach-mxs/gpio.c between commit
bf0c11183fc3a2acce56d2b53f2a117322bd3c3b ("ARM: 6744/1: mxs: irq_data
conversion") from the arm tree and commit
6bc4e4b309f83caa7a5ec2e6b5715bb7c2cb6879 ("arm: mxs: add irq_chip-name
for GPIO IRQs") from the i.MX tree.

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

diff --cc arch/arm/mach-mxs/gpio.c
index 61991e4,5120ab5..0000000
--- a/arch/arm/mach-mxs/gpio.c
+++ b/arch/arm/mach-mxs/gpio.c
@@@ -182,11 -182,12 +182,12 @@@ static int mxs_gpio_set_wake_irq(struc
  }
  
  static struct irq_chip gpio_irq_chip = {
+ 	.name = "mxs gpio",
 -	.ack = mxs_gpio_ack_irq,
 -	.mask = mxs_gpio_mask_irq,
 -	.unmask = mxs_gpio_unmask_irq,
 -	.set_type = mxs_gpio_set_irq_type,
 -	.set_wake = mxs_gpio_set_wake_irq,
 +	.irq_ack = mxs_gpio_ack_irq,
 +	.irq_mask = mxs_gpio_mask_irq,
 +	.irq_unmask = mxs_gpio_unmask_irq,
 +	.irq_set_type = mxs_gpio_set_irq_type,
 +	.irq_set_wake = mxs_gpio_set_wake_irq,
  };
  
  static void mxs_set_gpio_direction(struct gpio_chip *chip, unsigned offset,
--
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/