diff --git a/[refs] b/[refs]
index 4d75b1408306..e6842937a7ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d64a1b0abd4e10a76fff0af0c23e9a80f1b30d2e
+refs/heads/master: 1c14e6cecb1811543b1016f27e5d308fbea8c08a
diff --git a/trunk/arch/arm/mach-shmobile/board-g3evm.c b/trunk/arch/arm/mach-shmobile/board-g3evm.c
index a8f20cb0b7d2..95ccb949d5d9 100644
--- a/trunk/arch/arm/mach-shmobile/board-g3evm.c
+++ b/trunk/arch/arm/mach-shmobile/board-g3evm.c
@@ -100,7 +100,7 @@ static struct platform_device nor_flash_device = {
 };
 
 /* USBHS */
-void usb_host_port_power(int port, int power)
+static void usb_host_port_power(int port, int power)
 {
 	if (!power) /* only power-on supported for now */
 		return;