aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/include/asm/pm.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/include/asm/pm.h')
-rw-r--r--arch/mips/include/asm/pm.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/include/asm/pm.h b/arch/mips/include/asm/pm.h
index 7ecd4dfe3846..52f3d64c5f34 100644
--- a/arch/mips/include/asm/pm.h
+++ b/arch/mips/include/asm/pm.h
@@ -8,7 +8,7 @@
#ifndef __ASM_PM_H
#define __ASM_PM_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <asm/asm-offsets.h>
#include <asm/asm.h>
@@ -130,7 +130,7 @@
RESUME_RESTORE_REGS_RETURN
.endm
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
/**
* struct mips_static_suspend_state - Core saved CPU state across S2R.
@@ -150,6 +150,6 @@ struct mips_static_suspend_state {
unsigned long sp;
};
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_PM_HELPERS_H */
git/commit/t/aggregate-results.sh?h=main&id=2579e1d2936ad4e385ef21e5c346d9853d7faa01&follow=1'>tests: print failed test numbers at the end of the test runJens Lehmann1-1/+13 2011-07-22doc/fast-import: clarify notemodify commandDmitry Ivankov1-3/+8 2011-07-22Documentation: minor grammatical fix in rev-list-options.txtJack Nagel1-1/+1 2011-07-21Documentation: git-filter-branch honors replacement refsPeter Collingbourne1-2/+3 2011-07-20remote-curl: Add a format check to parsing of info/refsJulian Phillips1-0/+2 2011-07-19git-config: Remove extra whitespacesPavan Kumar Sunkara1-2/+2 2011-07-06docs: document --textconv diff optionJeff King1-0/+11 2011-06-29test: skip clean-up when running under --immediate modeJunio C Hamano1-2/+10 2011-06-29"branch -d" can remove more than one branchesJunio C Hamano1-1/+1 2011-06-28git-svn: Correctly handle root commits in mergeinfo rangesMichael Haggerty2-3/+7 2011-06-28git-svn: Disambiguate rev-list arguments to improve error messageMichael Haggerty1-2/+2