diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-09-04 10:10:27 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-09-04 10:10:27 +0200 |
| commit | 2a32a4d9c9cc4141abdf8e90f0cd167a614c9e91 (patch) | |
| tree | 1cd995a5f989c879d3d71566a1fa2db9745c5263 /sound/isa/sscape.c | |
| parent | 1f7f51a63114bab3a05920f4b1343154e95e2cb6 (diff) | |
| parent | 39cdc62b1b4efa39831d4de22f990043b0304fff (diff) | |
| download | linux-2a32a4d9c9cc4141abdf8e90f0cd167a614c9e91.tar.bz2 | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/isa/sscape.c')
| -rw-r--r-- | sound/isa/sscape.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c index 1cd2908e4f12..733adee5afbf 100644 --- a/sound/isa/sscape.c +++ b/sound/isa/sscape.c @@ -88,7 +88,7 @@ MODULE_PARM_DESC(joystick, "Enable gameport."); static int isa_registered; static int pnp_registered; -static struct pnp_card_device_id sscape_pnpids[] = { +static const struct pnp_card_device_id sscape_pnpids[] = { { .id = "ENS3081", .devs = { { "ENS0000" } } }, /* Soundscape PnP */ { .id = "ENS4081", .devs = { { "ENS1011" } } }, /* VIVO90 */ { .id = "" } /* end */ |