diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-01-12 03:59:14 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-01-12 03:59:14 -0500 |
| commit | 627b79628f56c3deeb17dec1edf6899b49552fa4 (patch) | |
| tree | deac8b2cce5d70708fa944a270ee031f069226d8 /sound/ppc | |
| parent | 29abceb67f8a230da806db4ed73899595bd2ae76 (diff) | |
| parent | 8c3f5d8a9b7d0d8506bc2a0525e012eae02b1853 (diff) | |
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"); | |||
| 36 | 36 | ||
| 37 | static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */ | 37 | static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */ |
| 38 | static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */ | 38 | static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */ |
| 39 | static int enable_beep = 1; | 39 | static bool enable_beep = 1; |
| 40 | 40 | ||
| 41 | module_param(index, int, 0444); | 41 | module_param(index, int, 0444); |
| 42 | MODULE_PARM_DESC(index, "Index value for " CHIP_NAME " soundchip."); | 42 | MODULE_PARM_DESC(index, "Index value for " CHIP_NAME " soundchip."); |