diff --git a/[refs] b/[refs]
index d63fc1087ecf..46a609a21626 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b4500d1944258184746c1f5ff05ab07b8f0b718
+refs/heads/master: 4114b6a6c3f2285f7f74065789dbd68fa24fc0ae
diff --git a/trunk/arch/mips/ralink/common.h b/trunk/arch/mips/ralink/common.h
index 300990313e1b..f4b19c679ed4 100644
--- a/trunk/arch/mips/ralink/common.h
+++ b/trunk/arch/mips/ralink/common.h
@@ -24,7 +24,7 @@ struct ralink_pinmux {
 	int uart_shift;
 	void (*wdt_reset)(void);
 };
-extern struct ralink_pinmux gpio_pinmux;
+extern struct ralink_pinmux rt_gpio_pinmux;
 
 struct ralink_soc_info {
 	unsigned char sys_type[RAMIPS_SYS_TYPE_LEN];
diff --git a/trunk/arch/mips/ralink/rt305x.c b/trunk/arch/mips/ralink/rt305x.c
index 5d49a54ba8fa..f1a6c330826c 100644
--- a/trunk/arch/mips/ralink/rt305x.c
+++ b/trunk/arch/mips/ralink/rt305x.c
@@ -114,7 +114,7 @@ void rt305x_wdt_reset(void)
 	rt_sysc_w32(t, SYSC_REG_SYSTEM_CONFIG);
 }
 
-struct ralink_pinmux gpio_pinmux = {
+struct ralink_pinmux rt_gpio_pinmux = {
 	.mode = mode_mux,
 	.uart = uart_mux,
 	.uart_shift = RT305X_GPIO_MODE_UART0_SHIFT,