diff --git a/[refs] b/[refs] index 899f941ab4a6..c46c370b7bc4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd5d503862b0d0d927c56ef2e34d3ededac88039 +refs/heads/master: 6a743897144500fb4c4566ced3a498d5180fbb5b diff --git a/trunk/include/linux/virtio_blk.h b/trunk/include/linux/virtio_blk.h index e2aba15f545d..6d8e61c48563 100644 --- a/trunk/include/linux/virtio_blk.h +++ b/trunk/include/linux/virtio_blk.h @@ -41,6 +41,11 @@ #define VIRTIO_BLK_F_TOPOLOGY 10 /* Topology information is available */ #define VIRTIO_BLK_F_CONFIG_WCE 11 /* Writeback mode available in config */ +#ifndef __KERNEL__ +/* Old (deprecated) name for VIRTIO_BLK_F_WCE. */ +#define VIRTIO_BLK_F_FLUSH VIRTIO_BLK_F_WCE +#endif + #define VIRTIO_BLK_ID_BYTES 20 /* ID string length */ struct virtio_blk_config {