ALSA: Merge es1688 and es968 drivers
authorKrzysztof Helt <krzysztof.h1@wp.pl>
Mon, 10 May 2010 07:47:32 +0000 (09:47 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 10 May 2010 07:49:30 +0000 (09:49 +0200)
commita20971b201ac1fcd236400942c98b0106c42c70a
treef71d82b13c1b0d8a94187a68c0b694605664bbf3
parent396fa8272601c3d488cb8391c3962a7ee552afd0
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>
Documentation/sound/alsa/ALSA-Configuration.txt
include/sound/es1688.h
sound/isa/Kconfig
sound/isa/es1688/es1688.c
sound/isa/es1688/es1688_lib.c
sound/isa/sb/Makefile
sound/isa/sb/es968.c [deleted file]