From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 29 Jul 2010 14:48:37 +0000 (+0100)
Subject: Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
X-Git-Tag: v2.6.36-rc1~591^2^2~1
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=d50f58bbd979e86378dfdec982452041f0e604ef;p=~andy%2Flinux

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
---

d50f58bbd979e86378dfdec982452041f0e604ef
diff --cc arch/arm/mach-mx3/mach-mx31lilly.c
index b2c7f512070,84942cf41b6..8f66f65e80e
--- a/arch/arm/mach-mx3/mach-mx31lilly.c
+++ b/arch/arm/mach-mx3/mach-mx31lilly.c
@@@ -289,13 -273,9 +285,14 @@@ static struct spi_board_info mc13783_de
  	.bus_num	= 1,
  	.chip_select	= 0,
  	.platform_data	= &mc13783_pdata,
+ 	.irq		= IOMUX_TO_IRQ(MX31_PIN_GPIO1_3),
  };
  
 +static struct platform_device *devices[] __initdata = {
 +	&smsc91x_device,
 +	&physmap_flash_device,
 +};
 +
  static int mx31lilly_baseboard;
  core_param(mx31lilly_baseboard, mx31lilly_baseboard, int, 0444);