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
..
aoa	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
arm	Merge remote branch 'alsa/devel' into topic/misc	2010-04-16 15:20:06 +02:00
atmel	ALSA: AC97: add full duplex support for atmel AT91 and AVR.	2010-03-25 20:22:36 +01:00
core	ALSA: take tu->qlock with irqs disabled	2010-05-05 09:57:08 +02:00
drivers	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
i2c	Merge remote branch 'alsa/devel' into topic/misc	2010-04-16 15:20:06 +02:00
isa	ALSA: Merge es1688 and es968 drivers	2010-05-10 09:49:30 +02:00
mips	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
oss	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
parisc	ALSA: sound/parisc: Move dereference after NULL test	2009-10-30 12:01:38 +01:00
pci	Merge branch 'fix/misc' into topic/misc	2010-05-10 09:48:47 +02:00
pcmcia	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
ppc	Merge remote branch 'alsa/devel' into topic/misc	2010-04-16 15:20:06 +02:00
sh	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
soc	Merge branch 'fix/asoc' into for-linus	2010-04-16 10:03:36 +02:00
sparc	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
spi	ALSA: Convert to snd_card_create() in other sound/*	2009-01-12 15:21:19 +01:00
synth	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
usb	ALSA: usb/mixer - use get_iface_desc() rather than direct structure	2010-04-16 10:37:50 +02:00
ac97_bus.c	ALSA: ac97 - Include ac97_codec.h for ac97_bus_type declaration	2008-12-02 16:25:37 +01:00
Kconfig	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
last.c	[ALSA] Remove sound/driver.h	2008-01-31 17:29:48 +01:00
Makefile	ALSA: Add Atmel ALSA drivers directory	2009-02-05 15:08:53 +01:00
sound_core.c	ALSA: use subsys_initcall for sound core instead of module_init	2010-01-14 21:21:47 +01:00
sound_firmware.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