diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
| commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
| tree | 2624a44924c625c367f3cebf937853b9da2de282 /drivers/ide/ide-floppy.c | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/ide/ide-floppy.c')
| -rw-r--r-- | drivers/ide/ide-floppy.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 4656587aa2f7..6ca3476d02c7 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
| @@ -82,7 +82,6 @@ | |||
| 82 | 82 | ||
| 83 | #define IDEFLOPPY_VERSION "0.99.newide" | 83 | #define IDEFLOPPY_VERSION "0.99.newide" |
| 84 | 84 | ||
| 85 | #include <linux/config.h> | ||
| 86 | #include <linux/module.h> | 85 | #include <linux/module.h> |
| 87 | #include <linux/types.h> | 86 | #include <linux/types.h> |
| 88 | #include <linux/string.h> | 87 | #include <linux/string.h> |
| @@ -2176,7 +2175,6 @@ static int ide_floppy_probe(ide_drive_t *drive) | |||
| 2176 | 2175 | ||
| 2177 | g->minors = 1 << PARTN_BITS; | 2176 | g->minors = 1 << PARTN_BITS; |
| 2178 | g->driverfs_dev = &drive->gendev; | 2177 | g->driverfs_dev = &drive->gendev; |
| 2179 | strcpy(g->devfs_name, drive->devfs_name); | ||
| 2180 | g->flags = drive->removable ? GENHD_FL_REMOVABLE : 0; | 2178 | g->flags = drive->removable ? GENHD_FL_REMOVABLE : 0; |
| 2181 | g->fops = &idefloppy_ops; | 2179 | g->fops = &idefloppy_ops; |
| 2182 | drive->attach = 1; | 2180 | drive->attach = 1; |