Merge branch 'next' into for-linus

[mv-sheeva.git] / include / asm-m32r / system.h

diff --git a/include/asm-m32r/system.h b/include/asm-m32r/system.h
index 70a57c8c002b59e0aa73f9c2c1d443e31f3297b2..c980f5ba8de7dc01a2c34e7f64e42b84d0b6a744 100644 (file)
--- a/include/asm-m32r/system.h
+++ b/include/asm-m32r/system.h
@@ -23,7 +23,7 @@
  */
 
 #if defined(CONFIG_FRAME_POINTER) || \
-       !defined(CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER)
+       !defined(CONFIG_SCHED_OMIT_FRAME_POINTER)
 #define M32R_PUSH_FP " push fp\n"
 #define M32R_POP_FP  " pop  fp\n"
 #else