diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h
index 0f93f8de0..3533bf9e3 100644
--- a/arch/arm/mach-at91/include/mach/gpio.h
+++ b/arch/arm/mach-at91/include/mach/gpio.h
@@ -248,15 +248,6 @@ struct at91_gpio_bank {
 
 extern int at91_gpio_init(struct at91_gpio_bank *data, int nr_banks);
 
-static inline int gpio_request(unsigned gpio, const char *label)
-{
-	return 0;
-}
-
-static inline void gpio_free(unsigned gpio)
-{
-}
-
 extern int gpio_direction_input(unsigned gpio);
 extern int gpio_direction_output(unsigned gpio, int value);
 #define gpio_get_value at91_get_gpio_value
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index bb0d6143f..c90df9d22 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -21,6 +21,7 @@
 #include <usb/ch9.h>
 #include <usb/gadget.h>
 #include <poller.h>
+#include <gpio.h>
 
 #include <linux/list.h>
 #include <linux/clk.h>
@@ -32,7 +33,6 @@
 #include <mach/io.h>
 #include <mach/board.h>
 #include <mach/cpu.h>
-#include <mach/gpio.h>
 #include <mach/at91sam9261_matrix.h>
 
 #include "at91_udc.h"
diff --git a/include/gpio.h b/include/gpio.h
index 9fc03a413..b7d840211 100644
--- a/include/gpio.h
+++ b/include/gpio.h
@@ -1 +1,14 @@
+#ifndef __GPIO_H
+#define __GPIO_H
+
 #include <asm/gpio.h>
+
+static inline int gpio_request(unsigned gpio, const char *label)
+{
+	return 0;
+}
+
+static inline void gpio_free(unsigned gpio)
+{
+}
+#endif /* __GPIO_H */