Merge branch 'devel'

[linux-2.6] / include / asm-s390 / sysinfo.h

diff --git a/include/asm-s390/sysinfo.h b/include/asm-s390/sysinfo.h
index 014f2a24664e49e1cd01a4a44771a653e8a05ccc..abe10ae15e468d9e8e6733fd26e4a5b0d3bdc7e6 100644 (file)
--- a/include/asm-s390/sysinfo.h
+++ b/include/asm-s390/sysinfo.h
@@ -20,6 +20,11 @@ struct sysinfo_1_1_1 {
        char sequence[16];
        char plant[4];
        char model[16];
+       char model_perm_cap[16];
+       char model_temp_cap[16];
+       char model_cap_rating[4];
+       char model_perm_cap_rating[4];
+       char model_temp_cap_rating[4];
 };
 
 struct sysinfo_1_2_1 {