diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
| commit | 8725f25acc656c1522d48a6746055099efdaca4c (patch) | |
| tree | e241424fa58178ed6c2a95a4eb931ea83dbea33c /include/asm-sparc64/dcr.h | |
| parent | c69cccc95fe4b90dde5fe33e6a3b77880b534fa4 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
Merge commit 'origin/master'
Manually fixed up:
drivers/net/fs_enet/fs_enet-main.c
Diffstat (limited to 'include/asm-sparc64/dcr.h')
| -rw-r--r-- | include/asm-sparc64/dcr.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/include/asm-sparc64/dcr.h b/include/asm-sparc64/dcr.h index 620c9ba642e9..d67613b1f5fe 100644 --- a/include/asm-sparc64/dcr.h +++ b/include/asm-sparc64/dcr.h | |||
| @@ -1,14 +1 @@ | |||
| 1 | #ifndef _SPARC64_DCR_H | #include <asm-sparc/dcr.h> | |
| 2 | #define _SPARC64_DCR_H | ||
| 3 | |||
| 4 | /* UltraSparc-III/III+ Dispatch Control Register, ASR 0x12 */ | ||
| 5 | #define DCR_DPE 0x0000000000001000 /* III+: D$ Parity Error Enable */ | ||
| 6 | #define DCR_OBS 0x0000000000000fc0 /* Observability Bus Controls */ | ||
| 7 | #define DCR_BPE 0x0000000000000020 /* Branch Predict Enable */ | ||
| 8 | #define DCR_RPE 0x0000000000000010 /* Return Address Prediction Enable */ | ||
| 9 | #define DCR_SI 0x0000000000000008 /* Single Instruction Disable */ | ||
| 10 | #define DCR_IPE 0x0000000000000004 /* III+: I$ Parity Error Enable */ | ||
| 11 | #define DCR_IFPOE 0x0000000000000002 /* IRQ FP Operation Enable */ | ||
| 12 | #define DCR_MS 0x0000000000000001 /* Multi-Scalar dispatch */ | ||
| 13 | |||
| 14 | #endif /* _SPARC64_DCR_H */ | ||