diff --git a/drivers/gpio/gpio-dw.c b/drivers/gpio/gpio-dw.c
index 65770422a..e46cc8e12 100644
--- a/drivers/gpio/gpio-dw.c
+++ b/drivers/gpio/gpio-dw.c
@@ -95,7 +95,7 @@ static int dw_gpio_get_direction(struct gpio_chip *gc, unsigned offset)
 	struct dw_gpio_instance *chip = to_dw_gpio(gc);
 
 	return (readl(chip->regs + DW_GPIO_DDR) & (1 << offset)) ?
-		GPIO_DIR_OUT : GPIO_DIR_IN;
+		GPIOF_DIR_OUT : GPIOF_DIR_IN;
 }
 
 static struct gpio_ops imx_gpio_ops = {
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index b7db59651..03fc19654 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -253,7 +253,7 @@ static int do_gpiolib(int argc, char *argv[])
 						i - gi->chip->base);
 
 		printf("  gpio %*d: %*s %*s %*s  %s\n", 4, i,
-			3, (dir < 0) ? "unk" : ((dir == GPIO_DIR_IN) ? "in" : "out"),
+			3, (dir < 0) ? "unk" : ((dir == GPIOF_DIR_IN) ? "in" : "out"),
 			3, (val < 0) ? "unk" : ((val == 0) ? "lo" : "hi"),
 			9, gi->requested ? "true" : "false",
 			gi->label ? gi->label : "");
diff --git a/include/gpio.h b/include/gpio.h
index 708b2aa11..f33b43550 100644
--- a/include/gpio.h
+++ b/include/gpio.h
@@ -3,8 +3,8 @@
 
 #include <asm/gpio.h>
 
-#define GPIO_DIR_OUT	(0 << 0)
-#define GPIO_DIR_IN	(1 << 0)
+#define GPIOF_DIR_OUT	(0 << 0)
+#define GPIOF_DIR_IN	(1 << 0)
 
 #ifndef CONFIG_GPIOLIB
 static inline int gpio_request(unsigned gpio, const char *label)