diff --git a/[refs] b/[refs] index bec3e615e299..aff686055af7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4c8aa5e5c229be926c40f83509c8a30145802c6 +refs/heads/master: eb9a63a1e550c489ba389c53bef0f7a94156fa8e diff --git a/trunk/arch/xtensa/include/asm/regs.h b/trunk/arch/xtensa/include/asm/regs.h index d4baed246928..a3075b12aff1 100644 --- a/trunk/arch/xtensa/include/asm/regs.h +++ b/trunk/arch/xtensa/include/asm/regs.h @@ -66,7 +66,7 @@ #define ICOUNTLEVEL 237 #define EXCVADDR 238 #define CCOMPARE 240 -#define MISC 244 +#define MISC_SR 244 /* Special names for read-only and write-only interrupt registers. */