Merge git://git.infradead.org/~dwmw2/random-2.6

[pandora-kernel.git] / include / asm-sparc64 / dcr.h

diff --git a/include/asm-sparc64/dcr.h b/include/asm-sparc64/dcr.h
index 620c9ba..d67613b 100644 (file)
--- a/include/asm-sparc64/dcr.h
+++ b/include/asm-sparc64/dcr.h
@@ -1,14 +1 @@
-#ifndef _SPARC64_DCR_H
-#define _SPARC64_DCR_H
-
-/* UltraSparc-III/III+ Dispatch Control Register, ASR 0x12 */
-#define DCR_DPE                0x0000000000001000 /* III+: D$ Parity Error Enable      */
-#define DCR_OBS                0x0000000000000fc0 /* Observability Bus Controls        */
-#define DCR_BPE                0x0000000000000020 /* Branch Predict Enable             */
-#define DCR_RPE                0x0000000000000010 /* Return Address Prediction Enable  */
-#define DCR_SI         0x0000000000000008 /* Single Instruction Disable        */
-#define DCR_IPE                0x0000000000000004 /* III+: I$ Parity Error Enable      */
-#define DCR_IFPOE      0x0000000000000002 /* IRQ FP Operation Enable           */
-#define DCR_MS         0x0000000000000001 /* Multi-Scalar dispatch             */
-
-#endif /* _SPARC64_DCR_H */
+#include <asm-sparc/dcr.h>