Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

MIPS: ralink: rename gpio_pinmux to rt_gpio_pinmux

Add proper namespacing to the variable.

Signed-off-by: John Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/5171/
John Crispin 12 years ago
parent
5b4500d194
commit
4114b6a6c3
2 changed files with 2 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 1
      arch/mips/ralink/common.h
  2. 1 1
      arch/mips/ralink/rt305x.c

+ 1 - 1
arch/mips/ralink/common.h
View File 

@@ -24,7 +24,7 @@ struct ralink_pinmux {
 
 	int uart_shift;
 
 	int uart_shift;
 
 	void (*wdt_reset)(void);
 
 	void (*wdt_reset)(void);
 
 };
 
 };
 
-extern struct ralink_pinmux gpio_pinmux;
 
+extern struct ralink_pinmux rt_gpio_pinmux;
 
 
 
 struct ralink_soc_info {
 
 struct ralink_soc_info {
 
 	unsigned char sys_type[RAMIPS_SYS_TYPE_LEN];
 
 	unsigned char sys_type[RAMIPS_SYS_TYPE_LEN];

+ 1 - 1
arch/mips/ralink/rt305x.c
View File 

@@ -114,7 +114,7 @@ void rt305x_wdt_reset(void)
 
 	rt_sysc_w32(t, SYSC_REG_SYSTEM_CONFIG);
 
 	rt_sysc_w32(t, SYSC_REG_SYSTEM_CONFIG);
 
 }
 
 }
 
 
 
-struct ralink_pinmux gpio_pinmux = {
 
+struct ralink_pinmux rt_gpio_pinmux = {
 
 	.mode = mode_mux,
 
 	.mode = mode_mux,
 
 	.uart = uart_mux,
 
 	.uart = uart_mux,
 
 	.uart_shift = RT305X_GPIO_MODE_UART0_SHIFT,
 
 	.uart_shift = RT305X_GPIO_MODE_UART0_SHIFT,