diff options
-rw-r--r-- | arch/mips/ralink/common.h | 2 | ||||
-rw-r--r-- | arch/mips/ralink/rt305x.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h index 300990313e1b..f4b19c679ed4 100644 --- a/arch/mips/ralink/common.h +++ b/arch/mips/ralink/common.h | |||
@@ -24,7 +24,7 @@ struct ralink_pinmux { | |||
24 | int uart_shift; | 24 | int uart_shift; |
25 | void (*wdt_reset)(void); | 25 | void (*wdt_reset)(void); |
26 | }; | 26 | }; |
27 | extern struct ralink_pinmux gpio_pinmux; | 27 | extern struct ralink_pinmux rt_gpio_pinmux; |
28 | 28 | ||
29 | struct ralink_soc_info { | 29 | struct ralink_soc_info { |
30 | unsigned char sys_type[RAMIPS_SYS_TYPE_LEN]; | 30 | unsigned char sys_type[RAMIPS_SYS_TYPE_LEN]; |
diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c index 5d49a54ba8fa..f1a6c330826c 100644 --- a/arch/mips/ralink/rt305x.c +++ b/arch/mips/ralink/rt305x.c | |||
@@ -114,7 +114,7 @@ void rt305x_wdt_reset(void) | |||
114 | rt_sysc_w32(t, SYSC_REG_SYSTEM_CONFIG); | 114 | rt_sysc_w32(t, SYSC_REG_SYSTEM_CONFIG); |
115 | } | 115 | } |
116 | 116 | ||
117 | struct ralink_pinmux gpio_pinmux = { | 117 | struct ralink_pinmux rt_gpio_pinmux = { |
118 | .mode = mode_mux, | 118 | .mode = mode_mux, |
119 | .uart = uart_mux, | 119 | .uart = uart_mux, |
120 | .uart_shift = RT305X_GPIO_MODE_UART0_SHIFT, | 120 | .uart_shift = RT305X_GPIO_MODE_UART0_SHIFT, |