Merge commit 'v2.6.28-rc2' into topic/asoc

[karo-tx-linux.git] / include / linux / genhd.h

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 04524c213de12ece9dbffd9cb27ae5018ddbd36d..e439e6aed832f3fc98b3a7944521f108e5740fbb 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -25,9 +25,6 @@ extern struct device_type part_type;
 extern struct kobject *block_depr;
 extern struct class block_class;
 
-extern const struct seq_operations partitions_op;
-extern const struct seq_operations diskstats_op;
-
 enum {
 /* These three have identical behaviour; use the second one if DOS FDISK gets
    confused about extended/logical partitions starting past cylinder 1023. */
@@ -59,6 +56,7 @@ enum {
 };
 
 #define DISK_MAX_PARTS                 256
+#define DISK_NAME_LEN                  32
 
 #include <linux/major.h>
 #include <linux/device.h>
@@ -140,7 +138,7 @@ struct gendisk {
        int minors;                     /* maximum number of minors, =1 for
                                          * disks that can't be partitioned. */
 
-       char disk_name[32];             /* name of major driver */
+       char disk_name[DISK_NAME_LEN];  /* name of major driver */
 
        /* Array of pointers to partitions indexed by partno.
         * Protected with matching bdev lock but stat and other