Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

[pandora-kernel.git] / arch / mips / include / asm / mach-bcm63xx / bcm63xx_gpio.h

diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
index 43d4da0..3999ec0 100644 (file)
--- 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)
        }
 }
 
-#define GPIO_DIR_OUT   0x0
-#define GPIO_DIR_IN    0x1
+#define BCM63XX_GPIO_DIR_OUT   0x0
+#define BCM63XX_GPIO_DIR_IN    0x1
 
 #endif /* !BCM63XX_GPIO_H */