o nbd: fix up headers changes, include blk.h and blkdev.h

Also fix an unbalanced #endif

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 856e397d4869533495013cebb17bc6d2f5a5b354..79aa653fe0a497e66fa9db62b2b0cdcdf874bd90 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -37,6 +37,8 @@
 #define PARANOIA
 #include <linux/major.h>
 
+#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/sched.h>

diff --git a/include/linux/nbd.h b/include/linux/nbd.h
index 6785f0ff61f349f1f2008df7d42418b23a0d676d..d0dae25ae2e07299a6a357df88b224d9da5e624a 100644 (file)
--- a/include/linux/nbd.h
+++ b/include/linux/nbd.h
@@ -53,7 +53,6 @@ struct nbd_device {
        int blksize_bits;
        u64 bytesize;
 };
-#endif
 
 /* This now IS in some kind of include file... */