mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 11:32:04 +00:00
a20971b201
The ESS ES968 chip is nothing more then a PnP companion for a non-PnP audio chip. It was paired with non-PnP ESS' chips: ES688 and ES1688. The ESS' audio chips are handled by the es1688 driver in native mode. The PnP cards are handled by the ES968 driver in SB compatible mode. Move the ES968 chip handling to the es1688 driver so the driver can handle both PnP and non-PnP cards. The es968 is removed. Also, a new PnP id is added for the card I acquired (the change was tested on this card). Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
29 lines
928 B
Makefile
29 lines
928 B
Makefile
#
|
|
# Makefile for ALSA
|
|
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
|
|
#
|
|
|
|
snd-sb-common-objs := sb_common.o sb_mixer.o
|
|
snd-sb8-dsp-objs := sb8_main.o sb8_midi.o
|
|
snd-sb16-dsp-objs := sb16_main.o
|
|
snd-sb16-csp-objs := sb16_csp.o
|
|
snd-sb8-objs := sb8.o
|
|
snd-sb16-objs := sb16.o
|
|
snd-sbawe-objs := sbawe.o emu8000.o
|
|
snd-emu8000-synth-objs := emu8000_synth.o emu8000_callback.o emu8000_patch.o emu8000_pcm.o
|
|
snd-jazz16-objs := jazz16.o
|
|
|
|
# Toplevel Module Dependency
|
|
obj-$(CONFIG_SND_SB_COMMON) += snd-sb-common.o
|
|
obj-$(CONFIG_SND_SB16_DSP) += snd-sb16-dsp.o
|
|
obj-$(CONFIG_SND_SB8_DSP) += snd-sb8-dsp.o
|
|
obj-$(CONFIG_SND_SB8) += snd-sb8.o
|
|
obj-$(CONFIG_SND_SB16) += snd-sb16.o
|
|
obj-$(CONFIG_SND_SBAWE) += snd-sbawe.o
|
|
obj-$(CONFIG_SND_JAZZ16) += snd-jazz16.o
|
|
ifeq ($(CONFIG_SND_SB16_CSP),y)
|
|
obj-$(CONFIG_SND_SB16) += snd-sb16-csp.o
|
|
obj-$(CONFIG_SND_SBAWE) += snd-sb16-csp.o
|
|
endif
|
|
obj-$(CONFIG_SND_SBAWE_SEQ) += snd-emu8000-synth.o
|