[PATCH] nbd.[ch] is broken by MAJOR_NR removal

[SL Baur]

nbd.h now does not include blk.h, so nbd.c needs to include it.  In
nbd.h an ifdef was removed without removing the closing endif.  Patch
is against bk-latest.

--- linus-2.5/drivers/block/nbd.c.orig	Fri Dec  6 11:56:52 2002
+++ linus-2.5/drivers/block/nbd.c	Fri Dec  6 15:48:55 2002
@@ -54,6 +54,7 @@
 #include <asm/types.h>
 
 #include <linux/nbd.h>
+#include <linux/blk.h>
 
 #define LO_MAGIC 0x68797548
 
--- linus-2.5/include/linux/nbd.h.orig	Fri Dec  6 11:56:52 2002
+++ linus-2.5/include/linux/nbd.h	Fri Dec  6 16:11:40 2002
@@ -53,7 +53,6 @@
 	int blksize_bits;
 	u64 bytesize;
 };
-#endif
 
 /* This now IS in some kind of include file...	*/