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 = {