aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/bcm63xx
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-05-04 04:38:57 -0400
committerRalf Baechle <ralf@linux-mips.org>2010-05-21 16:31:22 -0400
commit3e1bf29f73ccb31b99215476b0278f477db1a247 (patch)
tree1f97325f772ada21cd911a6bc7fd295b25806891 /arch/mips/bcm63xx
parent32130ec2daa0aa095f7c5d915a11a18d33b35402 (diff)
MIPS: BCM63xx: Avoid namespace clash on GPIO_DIR_{IN,OUT}
This is too generic a name, so prefix it with BCM63XX_ to avoid potential namespace clashes when including <asm/gpio.h>. Signed-off-by: Florian Fainelli <ffainelli@freebox.fr> To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1171/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/bcm63xx')
-rw-r--r--arch/mips/bcm63xx/gpio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/bcm63xx/gpio.c b/arch/mips/bcm63xx/gpio.c
index 315bc7f79ce1..f560fe7d38dd 100644
--- a/arch/mips/bcm63xx/gpio.c
+++ b/arch/mips/bcm63xx/gpio.c
@@ -91,7 +91,7 @@ static int bcm63xx_gpio_set_direction(struct gpio_chip *chip,
91 91
92 spin_lock_irqsave(&bcm63xx_gpio_lock, flags); 92 spin_lock_irqsave(&bcm63xx_gpio_lock, flags);
93 tmp = bcm_gpio_readl(reg); 93 tmp = bcm_gpio_readl(reg);
94 if (dir == GPIO_DIR_IN) 94 if (dir == BCM63XX_GPIO_DIR_IN)
95 tmp &= ~mask; 95 tmp &= ~mask;
96 else 96 else
97 tmp |= mask; 97 tmp |= mask;
@@ -103,14 +103,14 @@ static int bcm63xx_gpio_set_direction(struct gpio_chip *chip,
103 103
104static int bcm63xx_gpio_direction_input(struct gpio_chip *chip, unsigned gpio) 104static int bcm63xx_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
105{ 105{
106 return bcm63xx_gpio_set_direction(chip, gpio, GPIO_DIR_IN); 106 return bcm63xx_gpio_set_direction(chip, gpio, BCM63XX_GPIO_DIR_IN);
107} 107}
108 108
109static int bcm63xx_gpio_direction_output(struct gpio_chip *chip, 109static int bcm63xx_gpio_direction_output(struct gpio_chip *chip,
110 unsigned gpio, int value) 110 unsigned gpio, int value)
111{ 111{
112 bcm63xx_gpio_set(chip, gpio, value); 112 bcm63xx_gpio_set(chip, gpio, value);
113 return bcm63xx_gpio_set_direction(chip, gpio, GPIO_DIR_OUT); 113 return bcm63xx_gpio_set_direction(chip, gpio, BCM63XX_GPIO_DIR_OUT);
114} 114}
115 115
116 116