summaryrefslogtreecommitdiffstats
path: root/arch/mips/ralink
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2013-04-12 22:12:09 +0200
committerRalf Baechle <ralf@linux-mips.org>2013-05-08 01:19:08 +0200
commit4114b6a6c3f2285f7f74065789dbd68fa24fc0ae (patch)
tree478ca9f804bf4f103a4ac290783d8cfdcd959c76 /arch/mips/ralink
parent5b4500d1944258184746c1f5ff05ab07b8f0b718 (diff)
downloadop-kernel-dev-4114b6a6c3f2285f7f74065789dbd68fa24fc0ae.zip
op-kernel-dev-4114b6a6c3f2285f7f74065789dbd68fa24fc0ae.tar.gz
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/
Diffstat (limited to 'arch/mips/ralink')
-rw-r--r--arch/mips/ralink/common.h2
-rw-r--r--arch/mips/ralink/rt305x.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h
index 3009903..f4b19c6 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 5d49a54..f1a6c33 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,
OpenPOWER on IntegriCloud