From b68179de1048f996f710588449ed59111a392c10 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 2 Oct 2007 14:37:59 -0700 Subject: [PATCH] --- yaml --- r: 68978 b: refs/heads/master c: 5975f643efc39ebb762dfaf18ca6f2c95983dac0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/arcmsr/arcmsr_hba.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c01c83d78574..af596c52d37d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 774251ef64a1ad1e8b895e00d3d075cfa38d2af1 +refs/heads/master: 5975f643efc39ebb762dfaf18ca6f2c95983dac0 diff --git a/trunk/drivers/scsi/arcmsr/arcmsr_hba.c b/trunk/drivers/scsi/arcmsr/arcmsr_hba.c index f4d2d523db44..cfcf40159eab 100644 --- a/trunk/drivers/scsi/arcmsr/arcmsr_hba.c +++ b/trunk/drivers/scsi/arcmsr/arcmsr_hba.c @@ -125,6 +125,10 @@ static struct scsi_host_template arcmsr_scsi_host_template = { .shost_attrs = arcmsr_host_attrs, }; #ifdef CONFIG_SCSI_ARCMSR_AER +static pci_ers_result_t arcmsr_pci_slot_reset(struct pci_dev *pdev); +static pci_ers_result_t arcmsr_pci_error_detected(struct pci_dev *pdev, + pci_channel_state_t state); + static struct pci_error_handlers arcmsr_pci_error_handlers = { .error_detected = arcmsr_pci_error_detected, .slot_reset = arcmsr_pci_slot_reset,