diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-02-11 10:31:49 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-02-24 04:05:38 -0500 |
commit | 3636a145321573f2f735e3ae69f87e0fb166abec (patch) | |
tree | 90be2285c66900ef18cc870428cc86297242cde9 /arch/arm/mach-mx2/mach-pca100.c | |
parent | f0d3ab49110327516b7f0b6d27fd33d6fa079d6c (diff) |
arm/mx2: use per-SOC nand device
The previous commit introduced one nand device per SoC. Use this
directly instead of the compatibility macro that will break for
multi-SoC kernels. And while at it remove the compatibility macro now
that all in-tree users are fixed.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx2/mach-pca100.c')
-rw-r--r-- | arch/arm/mach-mx2/mach-pca100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx2/mach-pca100.c b/arch/arm/mach-mx2/mach-pca100.c index 9279b42b24b5..0c82ee1aa3f6 100644 --- a/arch/arm/mach-mx2/mach-pca100.c +++ b/arch/arm/mach-mx2/mach-pca100.c | |||
@@ -196,7 +196,7 @@ static void __init pca100_init(void) | |||
196 | mxc_gpio_mode(GPIO_PORTC | 29 | GPIO_GPIO | GPIO_IN); | 196 | mxc_gpio_mode(GPIO_PORTC | 29 | GPIO_GPIO | GPIO_IN); |
197 | mxc_register_device(&mxc_sdhc_device1, &sdhc_pdata); | 197 | mxc_register_device(&mxc_sdhc_device1, &sdhc_pdata); |
198 | 198 | ||
199 | mxc_register_device(&mxc_nand_device, &pca100_nand_board_info); | 199 | mxc_register_device(&imx27_nand_device, &pca100_nand_board_info); |
200 | 200 | ||
201 | /* only the i2c master 1 is used on this CPU card */ | 201 | /* only the i2c master 1 is used on this CPU card */ |
202 | i2c_register_board_info(1, pca100_i2c_devices, | 202 | i2c_register_board_info(1, pca100_i2c_devices, |