diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-09 13:55:17 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-09 13:55:17 -0500 |
| commit | b675b3667f6729dcd1036a2a129b35445947f905 (patch) | |
| tree | 0d58791e9063d3ca2c352da6f3e7df2bdb876f9d /drivers/hid/hid-prodikeys.c | |
| parent | 104a5f3cad8f2f27cadbdf0029400ecd9e17ccc0 (diff) | |
| parent | 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d (diff) | |
Merge commit 'v3.3-rc6' into next
Diffstat (limited to 'drivers/hid/hid-prodikeys.c')
| -rw-r--r-- | drivers/hid/hid-prodikeys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-prodikeys.c b/drivers/hid/hid-prodikeys.c index f779009104eb..b71b77ab0dc7 100644 --- a/drivers/hid/hid-prodikeys.c +++ b/drivers/hid/hid-prodikeys.c | |||
| @@ -90,7 +90,7 @@ static const char longname[] = "Prodikeys PC-MIDI Keyboard"; | |||
| 90 | 90 | ||
| 91 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; | 91 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; |
| 92 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; | 92 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; |
| 93 | static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; | 93 | static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; |
| 94 | 94 | ||
| 95 | module_param_array(index, int, NULL, 0444); | 95 | module_param_array(index, int, NULL, 0444); |
| 96 | module_param_array(id, charp, NULL, 0444); | 96 | module_param_array(id, charp, NULL, 0444); |