[PATCH] 2.5.6-pre2 II: rd cleanup

From: Dave Jones <davej@suse.de>
  kernel builds and boots with patch (with CONFIG_BLK_DEV_INITRD disabled).

(Trivial because CONFIG_BLK_DEV_RAM is Y if CONFIG_BLK_DEV_INITRD is Y)

diff --git a/include/linux/blk.h b/include/linux/blk.h
index 173634d2264b43018fc69b19ced5e22b5f286186..7818fe10dd657894329669dc3115076b3fd1c666 100644 (file)
--- a/include/linux/blk.h
+++ b/include/linux/blk.h
@@ -11,18 +11,24 @@
 extern void set_device_ro(kdev_t dev,int flag);
 extern void add_blkdev_randomness(int major);
 
+#ifdef CONFIG_BLK_DEV_RAM
+
+extern int rd_doload;          /* 1 = load ramdisk, 0 = don't load */
+extern int rd_prompt;          /* 1 = prompt for ramdisk, 0 = don't prompt */
+extern int rd_image_start;     /* starting block # of image */
+
 #ifdef CONFIG_BLK_DEV_INITRD
 
 #define INITRD_MINOR 250 /* shouldn't collide with /dev/ram* too soon ... */
 
 extern unsigned long initrd_start,initrd_end;
 extern int initrd_below_start_ok; /* 1 if it is not an error if initrd_start < memory_start */
-extern int rd_doload;          /* 1 = load ramdisk, 0 = don't load */
-extern int rd_prompt;          /* 1 = prompt for ramdisk, 0 = don't prompt */
-extern int rd_image_start;     /* starting block # of image */
 void initrd_init(void);
 
+#endif /* CONFIG_BLK_DEV_INITRD */
+
 #endif
+
 /*
  * end_request() and friends. Must be called with the request queue spinlock
  * acquired. All functions called within end_request() _must_be_ atomic.