diff options
| author | Mark Brown <broonie@kernel.org> | 2017-01-10 17:39:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-10 17:39:52 +0100 |
| commit | 9c1852b459f04f6309e40d1d167512b0a5598529 (patch) | |
| tree | a74526f1fe3f9826b81327f0b9ba9b98a543f87c /sound/pci/cs4281.c | |
| parent | ASoC: samsung: i2s: Provide I2S device for registered clocks (diff) | |
| parent | Linux 4.10-rc1 (diff) | |
| download | linux-9c1852b459f04f6309e40d1d167512b0a5598529.tar.xz linux-9c1852b459f04f6309e40d1d167512b0a5598529.zip | |
Merge tag 'v4.10-rc1' into asoc-samsung
Linux 4.10-rc1
Diffstat (limited to 'sound/pci/cs4281.c')
| -rw-r--r-- | sound/pci/cs4281.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index 615d8a99d8c8..8f0f5f24e40e 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c @@ -1194,7 +1194,7 @@ static void snd_cs4281_proc_init(struct cs4281 *chip) * joystick support */ -#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE)) +#if IS_REACHABLE(CONFIG_GAMEPORT) static void snd_cs4281_gameport_trigger(struct gameport *gameport) { |