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
..
ABI	USB: Fix documentation for avoid_reset_quirk	2010-03-19 07:24:11 -07:00
accounting
acpi
aoe
arm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
auxdisplay
blackfin
block	Documentation: fix block/biodoc.txt dma mapping description	2010-03-08 09:11:07 +01:00
blockdev
cdrom
cgroups	memcg: fix typo in memcg documentation	2010-03-24 16:31:20 -07:00
connector	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
console	doc: fix console doc typo	2010-02-24 13:51:32 +01:00
cpu-freq	[CPUFREQ] Processor Clocking Control interface driver	2010-01-13 10:55:16 -05:00
cpuidle
cris
crypto
development-process
device-mapper	dm: document when snapshot has finished merging	2010-03-06 02:29:56 +00:00
DocBook	Merge branch 'master' into for-linus	2010-03-19 08:05:10 +01:00
driver-model	Fix spelling of 'platform' in comments and doc	2010-02-05 12:22:34 +01:00
dvb	V4L/DVB: get_dvb_firmware: Fix typo, sort list of components	2010-02-26 15:10:56 -03:00
early-userspace
fault-injection	lkdtm: add debugfs access and loosen KPROBE ties	2010-03-06 11:26:32 -08:00
fb	fbdev: rename imacfb.txt to efifb.txt and change imacfb to efifb.	2010-04-07 08:38:02 -07:00
filesystems	9p: documentation update	2010-04-05 10:37:36 -05:00
firmware_class
frv
hwmon	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
i2c	i2c: Document the message size limit	2010-03-02 12:23:49 +01:00
i2o
ia64
ide
infiniband
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-04-15 11:49:55 -07:00
ioctl	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2010-03-19 09:43:06 -07:00
isdn	gigaset: small documentation improvement	2010-02-26 01:24:22 -08:00
ja_JP
kbuild
kdump
ko_KR
kvm	KVM: trivial document fixes	2010-03-01 12:35:43 -03:00
laptops	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
lguest	lguest: remove unneeded zlib.h include in example launcher	2010-02-24 14:22:22 +10:30
m68k
make
mips
misc-devices
mn10300
mtd
namespaces
netlabel
networking	net: corrected documentation for hardware time stamping	2010-04-07 21:52:07 -07:00
parisc
PCI	Documentation: rename PCI/PCI-DMA-mapping.txt to DMA-API-HOWTO.txt	2010-03-24 16:31:20 -07:00
pcmcia	pcmcia: use ops_mutex for rsrc_{mgr,nonstatic} locking	2010-02-17 17:48:24 +01:00
power	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
powerpc	powerpc/fsl: add device tree binding for QE firmware	2010-03-26 22:09:57 -06:00
pps
prctl
RCU	rcu: Use canonical URL for Mathieu's dissertation	2010-02-25 10:34:56 +01:00
s390	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
scheduler
scsi	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
serial	ldisc: new dcd_change() method for line disciplines	2010-03-12 15:52:43 -08:00
sh
sound	ALSA: Merge es1688 and es968 drivers	2010-05-10 09:49:30 +02:00
sparc
spi
sysctl	memcg: handle panic_on_oom=always case	2010-03-12 15:52:37 -08:00
telephony
thermal
timers	Documentation/timers/: split txt and source files	2010-03-12 15:52:35 -08:00
trace	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
uml
usb	USB: convert to the runtime PM framework	2010-03-02 14:54:12 -08:00
video4linux	V4L/DVB: Documentation: gspca.txt: update known mr97310a cams	2010-02-26 15:11:09 -03:00
vm	Documentation/vm/: split txt and source files	2010-03-12 15:52:35 -08:00
w1
watchdog	[WATCHDOG] doc: Fix use of WDIOC_SETOPTIONS ioctl.	2010-04-06 14:23:55 +00:00
wimax
x86	x86, numa: Remove configurable node size support for numa emulation	2010-02-15 14:34:18 -08:00
zh_CN
00-INDEX
applying-patches.txt
atomic_ops.txt
bad_memory.txt
basic_profiling.txt
binfmt_misc.txt
braille-console.txt
bt8xxgpio.txt
btmrvl.txt
BUG-HUNTING
cachetlb.txt	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-03-01 09:15:15 -08:00
Changes
circular-buffers.txt	Document Linux's circular buffering capabilities	2010-03-24 16:31:22 -07:00
CodingStyle
cpu-hotplug.txt
cpu-load.txt
cputopology.txt
credentials.txt
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt
dell_rbu.txt
devices.txt
DMA-API-HOWTO.txt	Documentation: rename PCI/PCI-DMA-mapping.txt to DMA-API-HOWTO.txt	2010-03-24 16:31:20 -07:00
DMA-API.txt	Documentation: rename PCI-DMA-mapping.txt to DMA-API-HOWTO.txt	2010-03-12 15:52:43 -08:00
DMA-attributes.txt
DMA-ISA-LPC.txt
dmaengine.txt
dontdiff	Merge branch 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig	2010-02-25 14:43:57 -08:00
dynamic-debug-howto.txt
edac.txt
eisa.txt	doc: fix Defaultd -> Defaults typo in EISA doc	2010-02-05 12:22:39 +01:00
email-clients.txt	Documentation/email-clients.txt: update gmail information	2010-03-12 15:52:35 -08:00
feature-removal-schedule.txt	ACPI: plan to delete "acpi=ht" boot option	2010-03-14 20:58:24 -04:00
flexible-arrays.txt
futex-requeue-pi.txt
gcov.txt
gpio.txt	gpio: introduce gpio_request_one() and friends	2010-03-06 11:26:48 -08:00
highuid.txt
HOWTO	HOWTO: Updates on subsystem trees, patchwork, -next (vs. -mm)	2010-03-07 17:04:49 -08:00
hw_random.txt
init.txt	init/main.c: improve usability in case of init binary failure	2010-03-06 11:26:29 -08:00
initrd.txt
intel_txt.txt
Intel-IOMMU.txt
io_ordering.txt
io-mapping.txt
IO-mapping.txt	Documentation: fix ioremap return type	2010-01-02 10:09:44 -08:00
iostats.txt
IPMI.txt	ipmi: add parameter to limit CPU usage in kipmid	2010-03-12 15:52:39 -08:00
IRQ-affinity.txt
IRQ.txt
irqflags-tracing.txt
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt	documentation: update kernel-doc-nano-HOWTO information	2010-01-11 09:34:07 -08:00
kernel-docs.txt
kernel-parameters.txt	Merge branch 'amd-iommu/fixes' into iommu/fixes	2010-04-07 14:36:20 +02:00
keys-request-key.txt
keys.txt
kmemcheck.txt
kmemleak.txt
kobject.txt	kobject: documentation: Update to refer to kset-example.c.	2010-03-19 07:12:20 -07:00
kprobes.txt	kprobes: Add documents of jump optimization	2010-02-25 17:49:27 +01:00
kref.txt
ldm.txt
leds-class.txt
leds-lp3944.txt
local_ops.txt
lockdep-design.txt
lockstat.txt
logo.gif
logo.txt
magic-number.txt
Makefile	Documentation/fs/: split txt and source files	2010-03-12 15:52:35 -08:00
ManagementStyle
mca.txt
md.txt
memory-barriers.txt	Document Linux's circular buffering capabilities	2010-03-24 16:31:22 -07:00
memory-hotplug.txt
memory.txt
mono.txt
mutex-design.txt
nmi_watchdog.txt
nommu-mmap.txt
numastat.txt
oops-tracing.txt
parport-lowlevel.txt
parport.txt
pi-futex.txt
pnp.txt	doc: capitalization and other minor fixes in pnp doc	2010-02-05 12:22:44 +01:00
preempt-locking.txt
printk-formats.txt
prio_tree.txt
rbtree.txt
rfkill.txt
robust-futex-ABI.txt
robust-futexes.txt
rt-mutex-design.txt
rt-mutex.txt
rtc.txt
SAK.txt
SecurityBugs
SELinux.txt
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
slow-work.txt
SM501.txt
Smack.txt
sparse.txt
spinlocks.txt
stable_api_nonsense.txt
stable_kernel_rules.txt
SubmitChecklist	Documentation/SubmitChecklist: add rule #1	2010-03-12 15:52:35 -08:00
SubmittingDrivers
SubmittingPatches
svga.txt
sysfs-rules.txt
sysrq.txt
tomoyo.txt
unaligned-memory-access.txt
unicode.txt
unshare.txt
VGA-softcursor.txt
vgaarbiter.txt
video-output.txt
volatile-considered-harmful.txt	Documentation/volatile-considered-harmful.txt: correct cpu_relax() documentation	2010-03-24 16:31:20 -07:00
zorro.txt