Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[sfrench/cifs-2.6.git] / include / asm-sh / entry-macros.S

diff --git a/include/asm-sh/entry-macros.S b/include/asm-sh/entry-macros.S
index 500030eae7aa8d1352c5ac6dbba0385ba57b1da2..2dab0b8d9454f8d8b67afa46016b2924b6b9b28f 100644 (file)
--- a/include/asm-sh/entry-macros.S
+++ b/include/asm-sh/entry-macros.S
@@ -12,7 +12,7 @@
        not     r11, r11
        stc     sr, r10
        and     r11, r10
-#ifdef CONFIG_HAS_SR_RB
+#ifdef CONFIG_CPU_HAS_SR_RB
        stc     k_g_imask, r11
        or      r11, r10
 #endif
@@ -20,7 +20,7 @@
        .endm
 
        .macro  get_current_thread_info, ti, tmp
-#ifdef CONFIG_HAS_SR_RB
+#ifdef CONFIG_CPU_HAS_SR_RB
        stc     r7_bank, \ti
 #else
        mov     #((THREAD_SIZE - 1) >> 10) ^ 0xff, \tmp