diff --git a/config-generic b/config-generic index 1313ef0a5..fbddfa25a 100644 --- a/config-generic +++ b/config-generic @@ -438,7 +438,7 @@ CONFIG_SCSI_PM8001=m CONFIG_VMWARE_PVSCSI=m CONFIG_VMWARE_BALLOON=m -# CONFIG_SCSI_ARCMSR is not set +CONFIG_SCSI_ARCMSR=m CONFIG_SCSI_BUSLOGIC=m CONFIG_SCSI_INITIO=m CONFIG_SCSI_FLASHPOINT=y diff --git a/kernel.spec b/kernel.spec index 9afed693d..3a52a76ce 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2276,6 +2276,9 @@ fi # ||----w | # || || %changelog +* Tue Jan 24 2012 Josh Boyer +- Re-enable the ARCMSR module (rhbz 784287) + * Tue Jan 24 2012 Josh Boyer - 3.3.0-0.rc1.git1.1 - Linux 3.3-rc1-git1 (upstream c1aab02dac690af7ff634d8e1cb3be6a04387eef)