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 /drivers/ide/ide-floppy.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/ide/ide-floppy.c')
| -rw-r--r-- | drivers/ide/ide-floppy.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 4656587aa2f7..68628327c0f5 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
| @@ -2176,7 +2176,6 @@ static int ide_floppy_probe(ide_drive_t *drive) | |||
| 2176 | 2176 | ||
| 2177 | g->minors = 1 << PARTN_BITS; | 2177 | g->minors = 1 << PARTN_BITS; |
| 2178 | g->driverfs_dev = &drive->gendev; | 2178 | g->driverfs_dev = &drive->gendev; |
| 2179 | strcpy(g->devfs_name, drive->devfs_name); | ||
| 2180 | g->flags = drive->removable ? GENHD_FL_REMOVABLE : 0; | 2179 | g->flags = drive->removable ? GENHD_FL_REMOVABLE : 0; |
| 2181 | g->fops = &idefloppy_ops; | 2180 | g->fops = &idefloppy_ops; |
| 2182 | drive->attach = 1; | 2181 | drive->attach = 1; |