summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-01-24 09:43:21 -0500
committerJosh Boyer <jwboyer@redhat.com>2012-01-24 09:43:21 -0500
commitc876c77b1081d642687e3dd1432444cab583fc75 (patch)
treea902f34566409996332ef9076643f24b4fe73eef
parent10e2c3572486f54e4ad3420c3ccba2b7a648aaf1 (diff)
downloadkernel-c876c77b1081d642687e3dd1432444cab583fc75.tar.gz
kernel-c876c77b1081d642687e3dd1432444cab583fc75.tar.xz
kernel-c876c77b1081d642687e3dd1432444cab583fc75.zip
Re-enable the ARCMSR module (rhbz 784287)
-rw-r--r--config-generic2
-rw-r--r--kernel.spec3
2 files changed, 4 insertions, 1 deletions
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 <jwboyer@redhat.com>
+- Re-enable the ARCMSR module (rhbz 784287)
+
* Tue Jan 24 2012 Josh Boyer <jwboyer@redhat.com> - 3.3.0-0.rc1.git1.1
- Linux 3.3-rc1-git1 (upstream c1aab02dac690af7ff634d8e1cb3be6a04387eef)