From a38289418a565a1775b15c58a43b7c503462f72d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Fri, 5 Mar 2010 11:04:45 +0100 Subject: [PATCH] --- yaml --- r: 201603 b: refs/heads/master c: a02b0420ff54bb21850c6faedc86838aadf2a832 h: refs/heads/master i: 201601: 41905287c3d3ddd906506332ad307f9fcf7fed8c 201599: 1262ccbb2ac8ef2309a0848cfd080fd9d4bfb3fa v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx1/mach-scb9328.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3090c363081d..16b4dd633553 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05a3185cad1bb4e1b2206fdca9041234c3662a25 +refs/heads/master: a02b0420ff54bb21850c6faedc86838aadf2a832 diff --git a/trunk/arch/arm/mach-mx1/mach-scb9328.c b/trunk/arch/arm/mach-mx1/mach-scb9328.c index 7c6bbe835458..ed2ff162c380 100644 --- a/trunk/arch/arm/mach-mx1/mach-scb9328.c +++ b/trunk/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 = {