diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-03-05 05:04:45 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-24 09:40:25 -0400 |
commit | a02b0420ff54bb21850c6faedc86838aadf2a832 (patch) | |
tree | ca541ab7905df29056c8ac7640bc362697c8a6cb | |
parent | 05a3185cad1bb4e1b2206fdca9041234c3662a25 (diff) |
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.c | 3 |
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) | |||
108 | ARRAY_SIZE(mxc_uart1_pins), "UART1"); | 108 | ARRAY_SIZE(mxc_uart1_pins), "UART1"); |
109 | } | 109 | } |
110 | 110 | ||
111 | static int uart1_mxc_exit(struct platform_device *pdev) | 111 | static void uart1_mxc_exit(struct platform_device *pdev) |
112 | { | 112 | { |
113 | mxc_gpio_release_multiple_pins(mxc_uart1_pins, | 113 | mxc_gpio_release_multiple_pins(mxc_uart1_pins, |
114 | ARRAY_SIZE(mxc_uart1_pins)); | 114 | ARRAY_SIZE(mxc_uart1_pins)); |
115 | return 0; | ||
116 | } | 115 | } |
117 | 116 | ||
118 | static struct imxuart_platform_data uart_pdata = { | 117 | static struct imxuart_platform_data uart_pdata = { |