diff options
| author |  Takashi Iwai <tiwai@suse.de>
| 2012-01-12 09:59:14 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de>
| 2012-01-12 09:59:14 +0100 |
| commit | 627b79628f56c3deeb17dec1edf6899b49552fa4 (patch) | |
| tree | deac8b2cce5d70708fa944a270ee031f069226d8 /sound/ppc | |
| parent | Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broon... (diff) | |
| parent | ALSA: usb-audio: add Yamaha MOX6/MOX8 support (diff) | |
| download | linux-627b79628f56c3deeb17dec1edf6899b49552fa4.tar.gz linux-627b79628f56c3deeb17dec1edf6899b49552fa4.tar.bz2 linux-627b79628f56c3deeb17dec1edf6899b49552fa4.zip | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/ppc')
| -rw-r--r-- | sound/ppc/powermac.c | 2 |
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."); |