diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-09 09:05:05 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-09 09:05:05 +0200 |
commit | 9424e8b1fedbaff34df187fdb87f9a9cba2d0ff2 (patch) | |
tree | 7a595ccc67ae0cd9a414383ff2f6ede291c7dc18 /arch/powerpc/configs/gamecube_defconfig | |
parent | bccf1da3546cc7aeefadc63cd4356ab8dc04c1e3 (diff) | |
parent | 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f (diff) | |
download | linux-0-day-9424e8b1fedbaff34df187fdb87f9a9cba2d0ff2.tar.gz linux-0-day-9424e8b1fedbaff34df187fdb87f9a9cba2d0ff2.tar.xz |
Merge 4.14-rc4 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc/configs/gamecube_defconfig')
-rw-r--r-- | arch/powerpc/configs/gamecube_defconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/configs/gamecube_defconfig b/arch/powerpc/configs/gamecube_defconfig index 79bbc8238b325..805b0f87653c1 100644 --- a/arch/powerpc/configs/gamecube_defconfig +++ b/arch/powerpc/configs/gamecube_defconfig @@ -64,11 +64,12 @@ CONFIG_LOGO=y # CONFIG_LOGO_LINUX_CLUT224 is not set CONFIG_SOUND=y CONFIG_SND=y -CONFIG_SND_SEQUENCER=y +CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=y CONFIG_SND_PCM_OSS=y -CONFIG_SND_SEQUENCER_OSS=y # CONFIG_SND_VERBOSE_PROCFS is not set +CONFIG_SND_SEQUENCER=y +CONFIG_SND_SEQUENCER_OSS=y # CONFIG_USB_SUPPORT is not set CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_GENERIC=y |