PM: Remove unbalanced mutex_unlock() from dpm_resume()

[linux-2.6-omap-h63xx.git] / include / asm-blackfin / gpio.h

diff --git a/include/asm-blackfin/gpio.h b/include/asm-blackfin/gpio.h
index d0426c1082623917a2d1b5744ef43aadc198c246..27ff532a806c6fc1aa804f05c79e5c47f0518963 100644 (file)
--- a/include/asm-blackfin/gpio.h
+++ b/include/asm-blackfin/gpio.h
@@ -376,16 +376,19 @@ struct gpio_port_t {
 #endif
 
 #ifdef CONFIG_PM
+unsigned int bfin_pm_setup(void);
+void bfin_pm_restore(void);
+
+#ifndef CONFIG_BF54x
 #define PM_WAKE_RISING 0x1
 #define PM_WAKE_FALLING        0x2
 #define PM_WAKE_HIGH   0x4
 #define PM_WAKE_LOW    0x8
 #define PM_WAKE_BOTH_EDGES     (PM_WAKE_RISING | PM_WAKE_FALLING)
+#define PM_WAKE_IGNORE 0xF0
 
 int gpio_pm_wakeup_request(unsigned gpio, unsigned char type);
 void gpio_pm_wakeup_free(unsigned gpio);
-unsigned int gpio_pm_setup(void);
-void gpio_pm_restore(void);
 
 struct gpio_port_s {
        unsigned short data;
@@ -409,6 +412,7 @@ struct gpio_port_s {
        unsigned short fer;
        unsigned short reserved;
 };
+#endif /*CONFIG_BF54x*/
 #endif /*CONFIG_PM*/
 
 /***********************************************************