diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 18:58:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 18:58:38 -0500 |
| commit | b286e39207237e2f6929959372bf66d9a8d05a82 (patch) | |
| tree | 0a88ef7c8a91b8cd1afbb85d4b60c9452cc0770e /drivers/scsi | |
| parent | bcb6ad1f5adb267c7b509f83e8edb16cc59d8500 (diff) | |
| parent | 6593178dd46d64a5bcb0402a4f3acd95b0687abd (diff) | |
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[] = { | |||
| 784 | #endif | 784 | #endif |
| 785 | 785 | ||
| 786 | static ide_driver_t idescsi_driver = { | 786 | static ide_driver_t idescsi_driver = { |
| 787 | .owner = THIS_MODULE, | ||
| 788 | .gen_driver = { | 787 | .gen_driver = { |
| 788 | .owner = THIS_MODULE, | ||
| 789 | .name = "ide-scsi", | 789 | .name = "ide-scsi", |
| 790 | .bus = &ide_bus_type, | 790 | .bus = &ide_bus_type, |
| 791 | .probe = ide_scsi_probe, | 791 | .probe = ide_scsi_probe, |