diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-13 16:25:38 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-13 16:25:38 -0500 |
| commit | 89ab216b33ba9405880fd3d89531305a931bc70f (patch) | |
| tree | 8f6428ce51ecaed6f6e1379c036dbe341eb71e34 /drivers/block/xen-blkback/common.h | |
| parent | c9d501e5cb0238910337213e12a09127221c35d8 (diff) | |
| parent | 46bf4a562207c5ebd24e1dde5e5ee326cd3d6b91 (diff) | |
Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/clock
Diffstat (limited to 'drivers/block/xen-blkback/common.h')
| -rw-r--r-- | drivers/block/xen-blkback/common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback/common.h index 9ad3b5ec1dc1..9a54623e52d7 100644 --- a/drivers/block/xen-blkback/common.h +++ b/drivers/block/xen-blkback/common.h | |||
| @@ -158,8 +158,8 @@ struct xen_vbd { | |||
| 158 | struct block_device *bdev; | 158 | struct block_device *bdev; |
| 159 | /* Cached size parameter. */ | 159 | /* Cached size parameter. */ |
| 160 | sector_t size; | 160 | sector_t size; |
| 161 | bool flush_support; | 161 | unsigned int flush_support:1; |
| 162 | bool discard_secure; | 162 | unsigned int discard_secure:1; |
| 163 | }; | 163 | }; |
| 164 | 164 | ||
| 165 | struct backend_info; | 165 | struct backend_info; |