1 From d5b75031f6ad0f9f82c3b8faeab3cda1cb4ebfe9 Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Fri, 12 Apr 2013 22:12:09 +0200
4 Subject: [PATCH 23/79] MIPS: ralink: rename gpio_pinmux to rt_gpio_pinmux
6 Add proper namespacing to the variable.
8 Signed-off-by: John Crispin <blogic@openwrt.org>
9 Patchwork: http://patchwork.linux-mips.org/patch/5171/
11 arch/mips/ralink/common.h | 2 +-
12 arch/mips/ralink/rt305x.c | 2 +-
13 2 files changed, 2 insertions(+), 2 deletions(-)
15 diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h
16 index 3009903..f4b19c6 100644
17 --- a/arch/mips/ralink/common.h
18 +++ b/arch/mips/ralink/common.h
19 @@ -24,7 +24,7 @@ struct ralink_pinmux {
21 void (*wdt_reset)(void);
23 -extern struct ralink_pinmux gpio_pinmux;
24 +extern struct ralink_pinmux rt_gpio_pinmux;
26 struct ralink_soc_info {
27 unsigned char sys_type[RAMIPS_SYS_TYPE_LEN];
28 diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c
29 index 5d49a54..f1a6c33 100644
30 --- a/arch/mips/ralink/rt305x.c
31 +++ b/arch/mips/ralink/rt305x.c
32 @@ -114,7 +114,7 @@ void rt305x_wdt_reset(void)
33 rt_sysc_w32(t, SYSC_REG_SYSTEM_CONFIG);
36 -struct ralink_pinmux gpio_pinmux = {
37 +struct ralink_pinmux rt_gpio_pinmux = {
40 .uart_shift = RT305X_GPIO_MODE_UART0_SHIFT,