--- a/drivers/block/genhd.c	2005-10-25 04:22:32 -07:00
+++ b/drivers/block/genhd.c	2005-10-25 04:22:32 -07:00
@@ -322,12 +322,6 @@
 /*
  * kobject & sysfs bindings for block devices
  */
-
-struct disk_attribute {
-	struct attribute attr;
-	ssize_t (*show)(struct gendisk *, char *);
-};
-
 static ssize_t disk_attr_show(struct kobject *kobj, struct attribute *attr,
 			      char *page)
 {
--- a/include/linux/genhd.h	2005-10-25 04:22:32 -07:00
+++ b/include/linux/genhd.h	2005-10-25 04:22:32 -07:00
@@ -110,6 +110,12 @@
 #endif
 };
 
+/* Structure for sysfs attributes on block devices */
+struct disk_attribute {
+	struct attribute attr;
+	ssize_t (*show)(struct gendisk *, char *);
+};
+
 /* 
  * Macros to operate on percpu disk statistics:
  * Since writes to disk_stats are serialised through the queue_lock,
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2005/01/14 11:57:48-08:00 greg@kroah.com 
#   [PATCH] Block: move struct disk_attribute to genhd.h
#   
#   This allows other block devices to add attributes to their sysfs
#   entries.
#   
#   Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
# 
# drivers/block/aoe/aoeblk.c
#   2005/01/14 11:21:23-08:00 greg@kroah.com +1 -8
#   Block: move struct disk_attribute to genhd.h
# 
# drivers/block/genhd.c
#   2005/01/14 11:21:23-08:00 greg@kroah.com +0 -6
#   Block: move struct disk_attribute to genhd.h
# 
# include/linux/genhd.h
#   2005/01/14 11:21:23-08:00 greg@kroah.com +6 -0
#   Block: move struct disk_attribute to genhd.h
#