From eddb1565a44e875aaa460234dc56b6758d6cb5ca Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 22 Jun 2011 09:25:28 -0300 Subject: [PATCH] --- yaml --- r: 258689 b: refs/heads/master c: 6d2385ab2532f3a8e2b9d195c006c07919555c31 h: refs/heads/master i: 258687: c6c2613c37e969dddd69502c3951895e07d61ea5 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/mach-mx27_3ds.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8b8a1e7129a4..1c2153e5d40e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c084473d7a51dde74008e44d995f6da569f17802 +refs/heads/master: 6d2385ab2532f3a8e2b9d195c006c07919555c31 diff --git a/trunk/arch/arm/mach-imx/mach-mx27_3ds.c b/trunk/arch/arm/mach-imx/mach-mx27_3ds.c index ccb9c3f7fe20..352f75da3a4a 100644 --- a/trunk/arch/arm/mach-imx/mach-mx27_3ds.c +++ b/trunk/arch/arm/mach-imx/mach-mx27_3ds.c @@ -262,11 +262,11 @@ static struct mc13xxx_platform_data mc13783_pdata = { }; /* SPI */ -static int spi2_internal_chipselect[] = {SPI2_SS0}; +static int spi2_chipselect[] = {SPI2_SS0}; static const struct spi_imx_master spi2_pdata __initconst = { - .chipselect = spi2_internal_chipselect, - .num_chipselect = ARRAY_SIZE(spi2_internal_chipselect), + .chipselect = spi2_chipselect, + .num_chipselect = ARRAY_SIZE(spi2_chipselect), }; static struct spi_board_info mx27_3ds_spi_devs[] __initdata = {