sdio: add SDIO_FBR_BASE(f) macro

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

diff --git a/include/asm-sh/ubc.h b/include/asm-sh/ubc.h
index 694f51f47941f551b8fef9e3c1fdc8ff99f7ee56..56f4e30dc49ce7f4916f86483d8777a826ab72d3 100644 (file)
--- a/include/asm-sh/ubc.h
+++ b/include/asm-sh/ubc.h
@@ -15,9 +15,8 @@
 #include <asm/cpu/ubc.h>
 
 /* 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)
+#if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709)
+#define UBC_TYPE_SH7729        (current_cpu_data.type == CPU_SH7729)
 #else
 #define UBC_TYPE_SH7729        0
 #endif
@@ -51,9 +50,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__ */