diff options
author | Florian Fainelli <florian@openwrt.org> | 2010-05-04 04:38:57 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2010-05-21 16:31:22 -0400 |
commit | 3e1bf29f73ccb31b99215476b0278f477db1a247 (patch) | |
tree | 1f97325f772ada21cd911a6bc7fd295b25806891 /arch/mips/include/asm/mach-bcm63xx | |
parent | 32130ec2daa0aa095f7c5d915a11a18d33b35402 (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/include/asm/mach-bcm63xx')
-rw-r--r-- | arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h index 43d4da0b1e9f..3999ec0aa7f5 100644 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h | |||
@@ -20,7 +20,7 @@ static inline unsigned long bcm63xx_gpio_count(void) | |||
20 | } | 20 | } |
21 | } | 21 | } |
22 | 22 | ||
23 | #define GPIO_DIR_OUT 0x0 | 23 | #define BCM63XX_GPIO_DIR_OUT 0x0 |
24 | #define GPIO_DIR_IN 0x1 | 24 | #define BCM63XX_GPIO_DIR_IN 0x1 |
25 | 25 | ||
26 | #endif /* !BCM63XX_GPIO_H */ | 26 | #endif /* !BCM63XX_GPIO_H */ |