Merge linux-2.6 with linux-acpi-2.6

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index a9f38b235981..9fab04f3056d 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -6,7 +6,7 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
- * $Revision: 1.64 $
+ * $Revision: 1.65 $
  */
 
 #ifndef DASD_INT_H
@@ -286,6 +286,7 @@ struct dasd_device {
         unsigned int bp_block;          /* bytes per block */
         unsigned int s2b_shift;         /* log2 (bp_block/512) */
         unsigned long flags;            /* per device flags */
+        unsigned short features;        /* copy of devmap-features (read-only!) */
 
         /* Device discipline stuff. */
         struct dasd_discipline *discipline;