summaryrefslogtreecommitdiff
path: root/drivers/message
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2009-03-06 17:13:52 +0000
committerBen Dooks <ben-linux@fluff.org>2009-03-06 17:13:52 +0000
commit1264fa6f8c5bf561a86128b2d48ace53e3f1e66f (patch)
tree69872715982d49ddea5819040c7032062376183b /drivers/message
parentefeff568677aa325f84d3ce37c219019887a79eb (diff)
parent559595a985e106d2fa9f0c79b7f5805453fed593 (diff)
downloadlinux-1264fa6f8c5bf561a86128b2d48ace53e3f1e66f.tar.gz
linux-1264fa6f8c5bf561a86128b2d48ace53e3f1e66f.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-fixes
Diffstat (limited to 'drivers/message')
-rw-r--r--drivers/message/fusion/mptbase.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 96ac88317b8e..ea3aafbbda44 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -91,9 +91,9 @@ MODULE_PARM_DESC(mpt_msi_enable_fc, " Enable MSI Support for FC \
controllers (default=0)");
static int mpt_msi_enable_sas;
-module_param(mpt_msi_enable_sas, int, 1);
+module_param(mpt_msi_enable_sas, int, 0);
MODULE_PARM_DESC(mpt_msi_enable_sas, " Enable MSI Support for SAS \
- controllers (default=1)");
+ controllers (default=0)");
static int mpt_channel_mapping;