X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=block%2Fgenhd.c;h=23b4f7063322c303dd5a1ab15c66a3a62daca7ca;hb=b3c9dd182ed3bdcdaf0e42625a35924b0497afdc;hp=c958169d24f04c338624e842622955453f62b5ae;hpb=5d381efb3d1f1ef10535a31ca0dd9b22fe1e1922;p=~andy%2Flinux

diff --git a/block/genhd.c b/block/genhd.c
index c958169d24f..23b4f706332 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -15,7 +15,6 @@
 #include <linux/slab.h>
 #include <linux/kmod.h>
 #include <linux/kobj_map.h>
-#include <linux/buffer_head.h>
 #include <linux/mutex.h>
 #include <linux/idr.h>
 #include <linux/log2.h>
@@ -507,7 +506,7 @@ static int exact_lock(dev_t devt, void *data)
 	return 0;
 }
 
-void register_disk(struct gendisk *disk)
+static void register_disk(struct gendisk *disk)
 {
 	struct device *ddev = disk_to_dev(disk);
 	struct block_device *bdev;
@@ -1109,7 +1108,7 @@ struct class block_class = {
 	.name		= "block",
 };
 
-static char *block_devnode(struct device *dev, mode_t *mode)
+static char *block_devnode(struct device *dev, umode_t *mode)
 {
 	struct gendisk *disk = dev_to_disk(dev);