diff options
author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /include/asm-ppc/reg_booke.h | |
parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'include/asm-ppc/reg_booke.h')
-rw-r--r-- | include/asm-ppc/reg_booke.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-ppc/reg_booke.h b/include/asm-ppc/reg_booke.h index e70c25f3c339..45c5e6f2b7ab 100644 --- a/include/asm-ppc/reg_booke.h +++ b/include/asm-ppc/reg_booke.h | |||
@@ -305,6 +305,7 @@ do { \ | |||
305 | #define ESR_PIL 0x08000000 /* Program Exception - Illegal */ | 305 | #define ESR_PIL 0x08000000 /* Program Exception - Illegal */ |
306 | #define ESR_PPR 0x04000000 /* Program Exception - Priveleged */ | 306 | #define ESR_PPR 0x04000000 /* Program Exception - Priveleged */ |
307 | #define ESR_PTR 0x02000000 /* Program Exception - Trap */ | 307 | #define ESR_PTR 0x02000000 /* Program Exception - Trap */ |
308 | #define ESR_FP 0x01000000 /* Floating Point Operation */ | ||
308 | #define ESR_DST 0x00800000 /* Storage Exception - Data miss */ | 309 | #define ESR_DST 0x00800000 /* Storage Exception - Data miss */ |
309 | #define ESR_DIZ 0x00400000 /* Storage Exception - Zone fault */ | 310 | #define ESR_DIZ 0x00400000 /* Storage Exception - Zone fault */ |
310 | #define ESR_ST 0x00800000 /* Store Operation */ | 311 | #define ESR_ST 0x00800000 /* Store Operation */ |