From 46c984ef0205112bbe49f9c4ff0e4daa47b323b4 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 24 Oct 2011 13:43:42 +0200 Subject: [PATCH] --- yaml --- r: 274330 b: refs/heads/master c: 536ec4f8d13433126f948d6e90821f811a4ebdf8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/Kconfig | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/[refs] b/[refs] index ed0bd66bbf00..f8f9cf53f2fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8d2de5e55183e2ec32228b3464be894cf7533c2 +refs/heads/master: 536ec4f8d13433126f948d6e90821f811a4ebdf8 diff --git a/trunk/drivers/scsi/Kconfig b/trunk/drivers/scsi/Kconfig index 8d9dae89f065..a757192ed584 100644 --- a/trunk/drivers/scsi/Kconfig +++ b/trunk/drivers/scsi/Kconfig @@ -607,20 +607,6 @@ config SCSI_ARCMSR To compile this driver as a module, choose M here: the module will be called arcmsr (modprobe arcmsr). -config SCSI_ARCMSR_AER - bool "Enable PCI Error Recovery Capability in Areca Driver(ARCMSR)" - depends on SCSI_ARCMSR && PCIEAER - default n - help - The advanced error reporting(AER) capability is "NOT" provided by - ARC1200/1201/1202 SATA RAID controllers cards. - If your card is one of ARC1200/1201/1202, please use the default setting, n. - If your card is other models, you could pick it - on condition that the kernel version is greater than 2.6.19. - This function is maintained driver by Nick Cheng. If you have any - problems or suggestion, you are welcome to contact with . - To enable this function, choose Y here. - source "drivers/scsi/megaraid/Kconfig.megaraid" source "drivers/scsi/mpt2sas/Kconfig"