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

[linux-2.6-microblaze.git] / drivers / s390 / cio / vfio_ccw_private.h

diff --git a/drivers/s390/cio/vfio_ccw_private.h b/drivers/s390/cio/vfio_ccw_private.h
index 078e46f..08e9a7d 100644 (file)
--- a/drivers/s390/cio/vfio_ccw_private.h
+++ b/drivers/s390/cio/vfio_ccw_private.h
@@ -63,7 +63,6 @@ enum vfio_ccw_state {
        VFIO_CCW_STATE_NOT_OPER,
        VFIO_CCW_STATE_STANDBY,
        VFIO_CCW_STATE_IDLE,
-       VFIO_CCW_STATE_BOXED,
        VFIO_CCW_STATE_BUSY,
        /* last element! */
        NR_VFIO_CCW_STATES