summaryrefslogtreecommitdiffstats
path: root/sound/ppc
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-01-12 09:59:14 +0100
committerTakashi Iwai <tiwai@suse.de>2012-01-12 09:59:14 +0100
commit627b79628f56c3deeb17dec1edf6899b49552fa4 (patch)
treedeac8b2cce5d70708fa944a270ee031f069226d8 /sound/ppc
parent29abceb67f8a230da806db4ed73899595bd2ae76 (diff)
parent8c3f5d8a9b7d0d8506bc2a0525e012eae02b1853 (diff)
downloadlinux-627b79628f56c3deeb17dec1edf6899b49552fa4.tar.bz2
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/ppc')
-rw-r--r--sound/ppc/powermac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c
index 65645693c485..5a4e263b5b0f 100644
--- a/sound/ppc/powermac.c
+++ b/sound/ppc/powermac.c
@@ -36,7 +36,7 @@ MODULE_LICENSE("GPL");
static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */
static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */
-static int enable_beep = 1;
+static bool enable_beep = 1;
module_param(index, int, 0444);
MODULE_PARM_DESC(index, "Index value for " CHIP_NAME " soundchip.");