From: Uwe Kleine-König Date: Fri, 5 Mar 2010 10:04:45 +0000 (+0100) Subject: ARM: mx1/scb9328: fix type of uart1_mxc_exit to make compiler happy X-Git-Tag: v2.6.36-rc1~591^2^2~1^2~26^2~55 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a02b0420ff54bb21850c6faedc86838aadf2a832;p=linux.git 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 --- 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 = {