From 4114b6a6c3f2285f7f74065789dbd68fa24fc0ae Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 12 Apr 2013 22:12:09 +0200 Subject: MIPS: ralink: rename gpio_pinmux to rt_gpio_pinmux Add proper namespacing to the variable. Signed-off-by: John Crispin Patchwork: http://patchwork.linux-mips.org/patch/5171/ --- arch/mips/ralink/common.h | 2 +- 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 { 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/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) 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, -- cgit v1.2.1