Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[net-next-2.6.git] / include / asm-sparc64 / scratchpad.h

diff --git a/include/asm-sparc64/scratchpad.h b/include/asm-sparc64/scratchpad.h
index 5e8b01fb334353422534b410707bc631effc0fdf..23675f6a915aa87c92229be934a2eaa8d9877880 100644 (file)
--- a/include/asm-sparc64/scratchpad.h
+++ b/include/asm-sparc64/scratchpad.h
@@ -1,14 +1 @@
-#ifndef _SPARC64_SCRATCHPAD_H
-#define _SPARC64_SCRATCHPAD_H
-
-/* Sun4v scratchpad registers, accessed via ASI_SCRATCHPAD.  */
-
-#define SCRATCHPAD_MMU_MISS    0x00 /* Shared with OBP - set by OBP        */
-#define SCRATCHPAD_CPUID       0x08 /* Shared with OBP - set by hypervisor */
-#define SCRATCHPAD_UTSBREG1    0x10
-#define SCRATCHPAD_UTSBREG2    0x18
-       /* 0x20 and 0x28, hypervisor only... */
-#define SCRATCHPAD_UNUSED1     0x30
-#define SCRATCHPAD_UNUSED2     0x38 /* Reserved for OBP                    */
-
-#endif /* !(_SPARC64_SCRATCHPAD_H) */
+#include <asm-sparc/scratchpad.h>