diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-19 00:58:38 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-19 00:58:38 +0100 |
| commit | b286e39207237e2f6929959372bf66d9a8d05a82 (patch) | |
| tree | 0a88ef7c8a91b8cd1afbb85d4b60c9452cc0770e /drivers/scsi | |
| parent | [COMPAT]: EXT3_IOC_SETVERSION is _IOW() not _IOR(). (diff) | |
| parent | [PATCH] ide: fix ide_toggle_bounce() to not try to bounce if we have an IOMMU (diff) | |
| download | linux-b286e39207237e2f6929959372bf66d9a8d05a82.tar.xz linux-b286e39207237e2f6929959372bf66d9a8d05a82.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/ide-scsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c index e1960d69fb90..4cb1f3ed9100 100644 --- a/drivers/scsi/ide-scsi.c +++ b/drivers/scsi/ide-scsi.c @@ -784,8 +784,8 @@ static ide_proc_entry_t idescsi_proc[] = { #endif static ide_driver_t idescsi_driver = { - .owner = THIS_MODULE, .gen_driver = { + .owner = THIS_MODULE, .name = "ide-scsi", .bus = &ide_bus_type, .probe = ide_scsi_probe, |