Merge tag 'for-v3.18' of git://git.infradead.org/battery-2.6

[cascardo/linux.git] / include / linux / blkdev.h

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 518b465..87be398 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1564,7 +1564,7 @@ static inline int blk_rq_map_integrity_sg(struct request_queue *q,
 }
 static inline struct blk_integrity *bdev_get_integrity(struct block_device *b)
 {
-       return 0;
+       return NULL;
 }
 static inline struct blk_integrity *blk_get_integrity(struct gendisk *disk)
 {