summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-03-05 11:04:45 +0100
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-24 15:40:25 +0200
commita02b0420ff54bb21850c6faedc86838aadf2a832 (patch)
treeca541ab7905df29056c8ac7640bc362697c8a6cb
parent05a3185cad1bb4e1b2206fdca9041234c3662a25 (diff)
downloadlinux-a02b0420ff54bb21850c6faedc86838aadf2a832.tar.bz2
ARM: mx1/scb9328: fix type of uart1_mxc_exit to make compiler happy
This fixes: arch/arm/mach-mx1/mach-scb9328.c:120: warning: initialization from incompatible pointer type Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-rw-r--r--arch/arm/mach-mx1/mach-scb9328.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-mx1/mach-scb9328.c b/arch/arm/mach-mx1/mach-scb9328.c
index 7c6bbe835458..ed2ff162c380 100644
--- a/arch/arm/mach-mx1/mach-scb9328.c
+++ b/arch/arm/mach-mx1/mach-scb9328.c
@@ -108,11 +108,10 @@ static int uart1_mxc_init(struct platform_device *pdev)
ARRAY_SIZE(mxc_uart1_pins), "UART1");
}
-static int uart1_mxc_exit(struct platform_device *pdev)
+static void uart1_mxc_exit(struct platform_device *pdev)
{
mxc_gpio_release_multiple_pins(mxc_uart1_pins,
ARRAY_SIZE(mxc_uart1_pins));
- return 0;
}
static struct imxuart_platform_data uart_pdata = {