summaryrefslogtreecommitdiffstats
path: root/drivers/ata/sata_sil24.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-20 01:02:01 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-20 01:02:01 +0100
commit10ce3cc919f50c2043b41ca968b43c26a3672600 (patch)
treeea409366a5208aced495bc0516a08b81fd43222e /drivers/ata/sata_sil24.c
parentInput: wacom - fix physical size calculation for 3rd-gen Bamboo (diff)
parentInput: ili210x - add support for Ilitek ILI210x based touchscreens (diff)
downloadlinux-10ce3cc919f50c2043b41ca968b43c26a3672600.tar.xz
linux-10ce3cc919f50c2043b41ca968b43c26a3672600.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/ata/sata_sil24.c')
-rw-r--r--drivers/ata/sata_sil24.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 1e9140626a83..e7e610aa9a7a 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -417,7 +417,7 @@ static struct ata_port_operations sil24_ops = {
#endif
};
-static int sata_sil24_msi; /* Disable MSI */
+static bool sata_sil24_msi; /* Disable MSI */
module_param_named(msi, sata_sil24_msi, bool, S_IRUGO);
MODULE_PARM_DESC(msi, "Enable MSI (Default: false)");