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/trident/trident.c | |
| parent | 29abceb67f8a230da806db4ed73899595bd2ae76 (diff) | |
| parent | 8c3f5d8a9b7d0d8506bc2a0525e012eae02b1853 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/trident/trident.c')
| -rw-r--r-- | sound/pci/trident/trident.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c index deb04b92412..5f1def7f45e 100644 --- a/sound/pci/trident/trident.c +++ b/sound/pci/trident/trident.c | |||
| @@ -47,7 +47,7 @@ MODULE_SUPPORTED_DEVICE("{{Trident,4DWave DX}," | |||
| 47 | 47 | ||
| 48 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ | 48 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ |
| 49 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ | 49 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ |
| 50 | static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */ | 50 | static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */ |
| 51 | static int pcm_channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 32}; | 51 | static int pcm_channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 32}; |
| 52 | static int wavetable_size[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 8192}; | 52 | static int wavetable_size[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 8192}; |
| 53 | 53 | ||