[S390] Get rid of cpuid.h header file.

[linux-block.git] / arch / s390 / include / asm / cpu.h

diff --git a/arch/s390/include/asm/cpu.h b/arch/s390/include/asm/cpu.h
index 702ad46841cf6b6deabba5c46eecd76d197b5859..471234b905743d60768e2f893c517f53b1d07c13 100644 (file)
--- a/arch/s390/include/asm/cpu.h
+++ b/arch/s390/include/asm/cpu.h
@@ -1,6 +1,26 @@
+/*
+ *    Copyright IBM Corp. 2000,2009
+ *    Author(s): Hartmut Penner <hp@de.ibm.com>,
+ *              Martin Schwidefsky <schwidefsky@de.ibm.com>,
+ *              Christian Ehrhardt <ehrhardt@de.ibm.com>,
+ */
+
 #ifndef _ASM_S390_CPU_H
 #define _ASM_S390_CPU_H
 
 #define MAX_CPU_ADDRESS 255
 
+#ifndef __ASSEMBLY__
+
+#include <linux/types.h>
+
+struct cpuid
+{
+       unsigned int version :  8;
+       unsigned int ident   : 24;
+       unsigned int machine : 16;
+       unsigned int unused  : 16;
+} __packed;
+
+#endif /* __ASSEMBLY__ */
 #endif /* _ASM_S390_CPU_H */