diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /include/linux/genhd.h | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'include/linux/genhd.h')
| -rw-r--r-- | include/linux/genhd.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 3498a0c68184..e4af57e87c17 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h | |||
| @@ -112,8 +112,6 @@ struct gendisk { | |||
| 112 | sector_t capacity; | 112 | sector_t capacity; |
| 113 | 113 | ||
| 114 | int flags; | 114 | int flags; |
| 115 | char devfs_name[64]; /* devfs crap */ | ||
| 116 | int number; /* more of the same */ | ||
| 117 | struct device *driverfs_dev; | 115 | struct device *driverfs_dev; |
| 118 | struct kobject kobj; | 116 | struct kobject kobj; |
| 119 | struct kobject *holder_dir; | 117 | struct kobject *holder_dir; |