am 5109146f: Merge "Reconcile assembly-only macros in <machine/cpu-features.h>"

Merge commit '5109146f954d8cca39d34689bff2762e15bc6933' into gingerbread-plus-aosp

* commit '5109146f954d8cca39d34689bff2762e15bc6933':
  Reconcile assembly-only macros in <machine/cpu-features.h>
This commit is contained in:
Jean-Baptiste Queru 2010-10-19 15:21:57 -07:00 committed by Android Git Automerger
commit d29b8a51a5

View File

@ -185,6 +185,7 @@
#endif
/* Assembly-only macros */
#ifdef __ASSEMBLY__
/* define a handy PLD(address) macro since the cache preload
* is an optional opcode
@ -195,4 +196,6 @@
# define PLD(reg,offset) /* nothing */
#endif
#endif /* ! __ASSEMBLY__ */
#endif /* _ARM_MACHINE_CPU_FEATURES_H */