Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

[mv-sheeva.git] / include / asm-sh / ubc.h

diff --git a/include/asm-sh/ubc.h b/include/asm-sh/ubc.h
index 694f51f47941f551b8fef9e3c1fdc8ff99f7ee56..ae9bbdeefbe128035cee2cae9b28419436b814ff 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