Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / include / linux / genhd.h

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index e4af57e..2ef845b 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -9,7 +9,13 @@
  *             <drew@colorado.edu>
  */
 
+#include <linux/config.h>
 #include <linux/types.h>
+#include <linux/major.h>
+#include <linux/device.h>
+#include <linux/smp.h>
+#include <linux/string.h>
+#include <linux/fs.h>
 
 enum {
 /* These three have identical behaviour; use the second one if DOS FDISK gets
@@ -55,12 +61,6 @@ struct partition {
 #endif
 
 #ifdef __KERNEL__
-#include <linux/major.h>
-#include <linux/device.h>
-#include <linux/smp.h>
-#include <linux/string.h>
-#include <linux/fs.h>
-
 struct partition {
        unsigned char boot_ind;         /* 0x80 - active */
        unsigned char head;             /* starting head */
@@ -112,6 +112,8 @@ struct gendisk {
        sector_t capacity;
 
        int flags;
+       char devfs_name[64];            /* devfs crap */
+       int number;                     /* more of the same */
        struct device *driverfs_dev;
        struct kobject kobj;
        struct kobject *holder_dir;