diff --git a/[refs] b/[refs]
index 58ed632c5bf4..d90400d7cb8d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2afe67453e5b1499459ee3596b1e7924a5208f5
+refs/heads/master: 2befb9e36dc52d715c3a67a9dbad36ac1edc376f
diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h
index aefa26fbae8a..efdc9b5bc05c 100644
--- a/trunk/include/linux/blkdev.h
+++ b/trunk/include/linux/blkdev.h
@@ -728,7 +728,7 @@ static inline unsigned int blksize_bits(unsigned int size)
 	return bits;
 }
 
-extern inline unsigned int block_size(struct block_device *bdev)
+static inline unsigned int block_size(struct block_device *bdev)
 {
 	return bdev->bd_block_size;
 }