summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-pca100.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-11 09:08:02 +0200
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-30 08:59:43 +0200
commit551823e7e031978b990e952c70ae01f8eba8d2c4 (patch)
treee039cb3d6e41878adcd5c5e370417bab479ac26a /arch/arm/mach-imx/mach-pca100.c
parent3e876935b805966f140bdae73f96bc4c3632c947 (diff)
downloadblackbird-op-linux-551823e7e031978b990e952c70ae01f8eba8d2c4.tar.gz
blackbird-op-linux-551823e7e031978b990e952c70ae01f8eba8d2c4.zip
ARM: imx: rename mxc_uart_devicex to follow a common naming scheme
Addionally remove an unneeded include. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-pca100.c')
-rw-r--r--arch/arm/mach-imx/mach-pca100.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c
index a87422ed4ff5..984c4caeebdc 100644
--- a/arch/arm/mach-imx/mach-pca100.c
+++ b/arch/arm/mach-imx/mach-pca100.c
@@ -320,7 +320,7 @@ static void __init pca100_init(void)
mxc_register_device(&imx_ssi_device0, &pca100_ssi_pdata);
- mxc_register_device(&mxc_uart_device0, &uart_pdata);
+ mxc_register_device(&imx2x_uart_device0, &uart_pdata);
mxc_gpio_mode(GPIO_PORTC | 29 | GPIO_GPIO | GPIO_IN);
mxc_register_device(&mxc_sdhc_device1, &sdhc_pdata);
OpenPOWER on IntegriCloud