diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
| commit | 4de3a8e101150feaefa1139611a50ff37467f33e (patch) | |
| tree | daada742542518b02d7db7c5d32e715eaa5f166d /sound/pci/cs5535audio | |
| parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
| parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) | |
Merge branch 'master' into fixes
Diffstat (limited to 'sound/pci/cs5535audio')
| -rw-r--r-- | sound/pci/cs5535audio/cs5535audio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c index b8959d2c804b..a2fb2173e980 100644 --- a/sound/pci/cs5535audio/cs5535audio.c +++ b/sound/pci/cs5535audio/cs5535audio.c | |||
| @@ -57,7 +57,7 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = { | |||
| 57 | 57 | ||
| 58 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; | 58 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; |
| 59 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; | 59 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; |
| 60 | static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; | 60 | static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; |
| 61 | 61 | ||
| 62 | module_param_array(index, int, NULL, 0444); | 62 | module_param_array(index, int, NULL, 0444); |
| 63 | MODULE_PARM_DESC(index, "Index value for " DRIVER_NAME); | 63 | MODULE_PARM_DESC(index, "Index value for " DRIVER_NAME); |