linux/sound/isa
Krzysztof Helt a20971b201 ALSA: Merge es1688 and es968 drivers
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>
2010-05-10 09:49:30 +02:00
..
ad1816a Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge 2009-02-16 23:03:57 +01:00
ad1848 ALSA: Convert to snd_card_create() in sound/isa/* 2009-01-12 15:20:26 +01:00
cs423x include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
es1688 ALSA: Merge es1688 and es968 drivers 2010-05-10 09:49:30 +02:00
gus ALSA: es1688: allocate snd_es1688 structure as a part of snd_card structure 2010-05-10 09:48:59 +02:00
msnd include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
opti9xx include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
sb ALSA: Merge es1688 and es968 drivers 2010-05-10 09:49:30 +02:00
wavefront include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
wss ALSA: opti93x: move controls definitions to opti93x driver 2009-12-11 14:43:16 +01:00
adlib.c ALSA: Convert to snd_card_create() in sound/isa/* 2009-01-12 15:20:26 +01:00
als100.c ALSA: dt019x: merge into the als100 driver 2009-12-11 14:43:04 +01:00
azt2320.c ALSA: Convert to snd_card_create() in sound/isa/* 2009-01-12 15:20:26 +01:00
cmi8330.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
es18xx.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
Kconfig ALSA: Merge es1688 and es968 drivers 2010-05-10 09:49:30 +02:00
Makefile ALSA: dt019x: merge into the als100 driver 2009-12-11 14:43:04 +01:00
opl3sa2.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
sc6000.c ALSA: sc6000: enable joystick port 2009-05-04 09:08:22 +02:00
sgalaxy.c ALSA: Convert to snd_card_create() in sound/isa/* 2009-01-12 15:20:26 +01:00
sscape.c ALSA: sscape: coding style fixes 2009-10-10 10:54:52 +02:00