Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[pandora-kernel.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index aa573c3..06ea3bc 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -617,20 +617,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 <nick.cheng@areca.com.tw>.
-         To enable this function, choose Y here.
-
 source "drivers/scsi/megaraid/Kconfig.megaraid"
 source "drivers/scsi/mpt2sas/Kconfig"