diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2011-06-09 22:07:05 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2011-06-09 22:07:05 +0530 |
| commit | 4b28d81a7ed82b906f1fdec0133d597b9cf57f85 (patch) | |
| tree | fc722c2bafb704c0db35599392d8f8dddbb4e36d /include/linux/blkdev.h | |
| parent | 114df7d66efd5c23561782f38e97c48fb30d4f5d (diff) | |
| parent | 626a96db11698119a67eeda130488e869aa6f14e (diff) | |
Merge remote branch 'gpio/ep93xx-dma' into next
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index ae9091a68480..1a23722e8878 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1282,8 +1282,8 @@ queue_max_integrity_segments(struct request_queue *q) #define blk_get_integrity(a) (0) #define blk_integrity_compare(a, b) (0) #define blk_integrity_register(a, b) (0) -#define blk_integrity_unregister(a) do { } while (0); -#define blk_queue_max_integrity_segments(a, b) do { } while (0); +#define blk_integrity_unregister(a) do { } while (0) +#define blk_queue_max_integrity_segments(a, b) do { } while (0) #define queue_max_integrity_segments(a) (0) #define blk_integrity_merge_rq(a, b, c) (0) #define blk_integrity_merge_bio(a, b, c) (0) |