diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 15:58:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 15:58:38 -0800 |
| commit | b286e39207237e2f6929959372bf66d9a8d05a82 (patch) | |
| tree | 0a88ef7c8a91b8cd1afbb85d4b60c9452cc0770e /drivers/ide/ide-floppy.c | |
| parent | bcb6ad1f5adb267c7b509f83e8edb16cc59d8500 (diff) | |
| parent | 6593178dd46d64a5bcb0402a4f3acd95b0687abd (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
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 f615ab75996..94c147b79a4 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, |