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/pci/lola/lola.c | |
| parent | 29abceb67f8a230da806db4ed73899595bd2ae76 (diff) | |
| parent | 8c3f5d8a9b7d0d8506bc2a0525e012eae02b1853 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/lola/lola.c')
| -rw-r--r-- | sound/pci/lola/lola.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/lola/lola.c b/sound/pci/lola/lola.c index 924168ef1ed6..375982736858 100644 --- a/sound/pci/lola/lola.c +++ b/sound/pci/lola/lola.c | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | /* Standard options */ | 35 | /* Standard options */ |
| 36 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; | 36 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; |
| 37 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; | 37 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; |
| 38 | static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; | 38 | static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; |
| 39 | 39 | ||
| 40 | module_param_array(index, int, NULL, 0444); | 40 | module_param_array(index, int, NULL, 0444); |
| 41 | MODULE_PARM_DESC(index, "Index value for Digigram Lola driver."); | 41 | MODULE_PARM_DESC(index, "Index value for Digigram Lola driver."); |