Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / reg.h

diff --git a/include/asm-powerpc/reg.h b/include/asm-powerpc/reg.h
index 1f685047c6ffe80c983a5bff36e53777206ff7bb..0d6238987df864f9b7f2d4f1cff8a6b7fade4fda 100644 (file)
--- a/include/asm-powerpc/reg.h
+++ b/include/asm-powerpc/reg.h
@@ -18,6 +18,10 @@
 #include <asm/reg_booke.h>
 #endif /* CONFIG_BOOKE || CONFIG_40x */
 
+#ifdef CONFIG_FSL_EMB_PERFMON
+#include <asm/reg_fsl_emb.h>
+#endif
+
 #ifdef CONFIG_8xx
 #include <asm/reg_8xx.h>
 #endif /* CONFIG_8xx */
@@ -553,6 +557,7 @@
 #define SPRN_PA6T_BTCR 978     /* Breakpoint and Tagging Control Register */
 #define SPRN_PA6T_IMAAT        979     /* Instruction Match Array Action Table */
 #define SPRN_PA6T_PCCR 1019    /* Power Counter Control Register */
+#define SPRN_BKMK      1020    /* Cell Bookmark Register */
 #define SPRN_PA6T_RPCCR        1021    /* Retire PC Trace Control Register */