diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-10 08:57:14 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-10 08:57:14 +0100 |
| commit | 099b4d3b473db012a55ce6bec9ef594d0508e782 (patch) | |
| tree | a55980b995612c188d02bd6f47b93f1e17733572 /include/linux/blkdev.h | |
| parent | 09e1e9c4a4009a75c1dd716b6f0797fae3ab4dfd (diff) | |
| parent | 7e9f1945213cdd7cd11f29346ded07a81854b5af (diff) | |
Merge branch 'davinci-next' of git://gitorious.org/linux-davinci/linux-davinci into fixes
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) |