Driver core: accept all valid action-strings in uevent-trigger

[linux-2.6-omap-h63xx.git] / include / asm-sh / ubc.h

diff --git a/include/asm-sh/ubc.h b/include/asm-sh/ubc.h
index 694f51f47941f551b8fef9e3c1fdc8ff99f7ee56..38d46e01b8463dd04e20f664041a0df8d469a039 100644 (file)
--- a/include/asm-sh/ubc.h
+++ b/include/asm-sh/ubc.h
@@ -17,7 +17,7 @@
 /* User Break Controller */
 #if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709) || \
     defined(CONFIG_CPU_SUBTYPE_SH7300)
-#define UBC_TYPE_SH7729        (cpu_data->type == CPU_SH7729)
+#define UBC_TYPE_SH7729        (current_cpu_data.type == CPU_SH7729)
 #else
 #define UBC_TYPE_SH7729        0
 #endif
@@ -51,9 +51,14 @@
 #define BRCR_UBDE              (1 << 0)
 
 #ifndef __ASSEMBLY__
-/* arch/sh/kernel/ubc.S */
-extern void ubc_wakeup(void);
+/* arch/sh/kernel/cpu/ubc.S */
 extern void ubc_sleep(void);
+
+#ifdef CONFIG_UBC_WAKEUP
+extern void ubc_wakeup(void);
+#else
+#define ubc_wakeup()   do { } while (0)
+#endif
 #endif
 
 #endif /* __KERNEL__ */