Merge branch 'master' of git://git.denx.de/u-boot-marvell

[u-boot] / arch / arm / include / asm / arch-mx31 / mx31.h

diff --git a/arch/arm/include/asm/arch-mx31/mx31.h b/arch/arm/include/asm/arch-mx31/mx31.h
index 3cc4b350b6d48b7f15873d67040be2d92ff2ee0f..f702d260f1157ec9e40f4484f0b99645312f51c5 100644 (file)
--- a/arch/arm/include/asm/arch-mx31/mx31.h
+++ b/arch/arm/include/asm/arch-mx31/mx31.h
@@ -37,12 +37,17 @@ enum mx31_gpio_direction {
 extern int mx31_gpio_direction(unsigned int gpio,
                               enum mx31_gpio_direction direction);
 extern void mx31_gpio_set(unsigned int gpio, unsigned int value);
+extern int mx31_gpio_get(unsigned int gpio);
 #else
 static inline int mx31_gpio_direction(unsigned int gpio,
                                      enum mx31_gpio_direction direction)
 {
        return 1;
 }
+static inline int mx31_gpio_get(unsigned int gpio)
+{
+       return 1;
+}
 static inline void mx31_gpio_set(unsigned int gpio, unsigned int value)
 {
 }