diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-21 14:42:20 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-21 14:42:20 -0400 |
| commit | b876d08f816527af257e13d89fb0d3b4b849223c (patch) | |
| tree | 40569f568230f918ca55f04b355e251747f913ed /drivers/scsi/ipr.c | |
| parent | b364776ad1208a71f0c53578c84619a395412a8d (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/pci/dmar.c
Diffstat (limited to 'drivers/scsi/ipr.c')
| -rw-r--r-- | drivers/scsi/ipr.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index d30eb7ba018e..098739deb02e 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
| @@ -7859,7 +7859,6 @@ static struct pci_driver ipr_driver = { | |||
| 7859 | .remove = ipr_remove, | 7859 | .remove = ipr_remove, |
| 7860 | .shutdown = ipr_shutdown, | 7860 | .shutdown = ipr_shutdown, |
| 7861 | .err_handler = &ipr_err_handler, | 7861 | .err_handler = &ipr_err_handler, |
| 7862 | .dynids.use_driver_data = 1 | ||
| 7863 | }; | 7862 | }; |
| 7864 | 7863 | ||
| 7865 | /** | 7864 | /** |