diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-11 18:51:40 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-11 18:51:40 +0200 |
| commit | 10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1 (patch) | |
| tree | eddf856286234f28cac747d20eb59d918e1bc8b5 /drivers/scsi/sata_promise.c | |
| parent | [PATCH] ahci: do not fail softreset if PHY reports no device (diff) | |
| parent | [PATCH] __group_complete_signal: remove bogus BUG_ON (diff) | |
| download | linux-10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1.tar.xz linux-10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1.zip | |
Merge branch 'master'
Conflicts:
drivers/scsi/libata-scsi.c
include/linux/libata.h
Diffstat (limited to 'drivers/scsi/sata_promise.c')
| -rw-r--r-- | drivers/scsi/sata_promise.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c index 000844a4129f..ddbc0c6dd9fe 100644 --- a/drivers/scsi/sata_promise.c +++ b/drivers/scsi/sata_promise.c @@ -111,7 +111,6 @@ static struct scsi_host_template pdc_ata_sht = { .name = DRV_NAME, .ioctl = ata_scsi_ioctl, .queuecommand = ata_scsi_queuecmd, - .eh_strategy_handler = ata_scsi_error, .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, .sg_tablesize = LIBATA_MAX_PRD, |