]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ARM: 6322/1: imx/pca100: Fix name of spi platform data
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Tue, 10 Aug 2010 20:18:57 +0000 (21:18 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 10 Aug 2010 21:11:43 +0000 (22:11 +0100)
Commit

7536cf9 (ARM: imx: dynamically register spi_imx devices (imx27))

introduced a variable named "pca100_spi0_data" but passed
"&pca100_spi_0_data" to imx27_add_spi_imx0.  This wasn't noticed earlier
because both SPI_IMX and MACH_PCA100 are not enabled in mx27_defconfig.

This fixes a build failure:

arch/arm/mach-imx/mach-pca100.c: In function 'pca100_init':
arch/arm/mach-imx/mach-pca100.c:411: error: 'pca100_spi_0_data' undeclared (first use in this function)
arch/arm/mach-imx/mach-pca100.c:411: error: (Each undeclared identifier is reported only once
arch/arm/mach-imx/mach-pca100.c:411: error: for each function it appears in.)

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-imx/mach-pca100.c

index 6c92deaf468f6677559655fe366fba8aad97006c..a389d1148f18c641cd1c997f4798b6641e084bdc 100644 (file)
@@ -408,7 +408,7 @@ static void __init pca100_init(void)
        mxc_gpio_mode(GPIO_PORTD | 27 | GPIO_GPIO | GPIO_IN);
        spi_register_board_info(pca100_spi_board_info,
                                ARRAY_SIZE(pca100_spi_board_info));
-       imx27_add_spi_imx0(&pca100_spi_0_data);
+       imx27_add_spi_imx0(&pca100_spi0_data);
 #endif
 
        gpio_request(OTG_PHY_CS_GPIO, "usb-otg-cs");