diff options
| author | Jeff Garzik | 2005-11-19 01:55:06 +0100 |
|---|---|---|
| committer | Jeff Garzik | 2005-11-19 01:55:06 +0100 |
| commit | 4b317d212cc23a1d635ca8329c802224178afddf (patch) | |
| tree | c671d279518dad01e58ff97b639fdb984aa2c9e6 /drivers/ide/ide-floppy.c | |
| parent | Merge branch 'master' (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | kernel-qcow2-linux-4b317d212cc23a1d635ca8329c802224178afddf.tar.gz kernel-qcow2-linux-4b317d212cc23a1d635ca8329c802224178afddf.tar.xz kernel-qcow2-linux-4b317d212cc23a1d635ca8329c802224178afddf.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/ide/ide-floppy.c')
| -rw-r--r-- | drivers/ide/ide-floppy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index f615ab759962..94c147b79a49 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c @@ -1925,8 +1925,8 @@ static ide_proc_entry_t idefloppy_proc[] = { static int ide_floppy_probe(struct device *); static ide_driver_t idefloppy_driver = { - .owner = THIS_MODULE, .gen_driver = { + .owner = THIS_MODULE, .name = "ide-floppy", .bus = &ide_bus_type, .probe = ide_floppy_probe, |