Changes v1.0.16rc2 v1.0.16

Changelog between 1.0.15 and 1.0.16 releases

alsa-tools

ac3dec (Dolby Digital Decoder)

support for dynamic 2.0/5.1 AC3 changes - bug#3441

hdspconf

Fix a small memleak

hdspmixer

hdspmixer - Fix compilation with gcc4.3

hdspmixer - small memory leak fix

hdspmixer - Automatic initialization of secondary cards

sbiload

sbiload - Rewritten to use hwdep device

Changelog between 1.0.15rc1 and 1.0.16 releases

alsa-plugins

Core

release 1.0.16rc1

release 1.0.15

release 1.0.15rc1

PulseAudio -> ALSA plugin

PulseAudio plugin: report XRUN state back to application

Fix wrong assert in pulse plugin

Use different buffer metrics in the PulseAudio plugin

Fix unexpected assert with pulse plugin

pulse - Add minmax condition for period_bytes and periods

alsa-utils

Core

Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz

alsactl - restore dB level

ALSA Control (alsactl)

alsactl - Fix wrong restore

alsactl: skip inactive controls

alsactl - fix double entry of comment.tlv

Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz

alsactl - Set -F option as default

Make alsactl restore a bit more robust

alsactl - restore dB level

Speaker Test

speaker-test - Fix number of periods to play

speaker-test - Put errors to stderr

Remove xfer_align

alsamixer

alsamixer: add 8-channel support

Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz

amixer

Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz

aplay/arecord

aplay - Reset non-blocking flag before snd_pcm_drain()

Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz

Remove sleep_min from aplay

Remove xfer_align

aplaymidi/arecordmidi

arecordmidi: mention SMF type in man page

aseqnet

Add missing inclusion of assert.h

iecset

iecset: fix card index check

iecset - Add -n option

alsa-firmware

AudioScience ASIHPI Firmware

asihpi - update firmwares for asihpi30905

asihpi firmware update for verion 3.09.09

Emagic EMI 2|6 Audio Interface Firmware

emi26: complete license.txt

Changelog between 1.0.16rc2 and 1.0.16 releases

alsa-driver

Sound Core

Check __ffs in configure script for older kernels

release 1.0.16

release 1.0.16rc2

ALSA Core

Check __ffs in configure script for older kernels

ALSA<-OSS emulation

Add more fallbacks to OSS PHONEOUT mixer map

Fix Oops with PCM OSS sync

Asihpi driver

asihpi version 3.09.09

CMI8788 (Oxygen) driver

oxygen - Fix section mismatch

oxygen: fix line-in recording selection

oxygen: revert SPI clock frequency change for AK4396/WM8785

CREDITS file

2.6 kernel sync

CX88 driver

V4L/DVB (6185): cx88-alsa: Add mute controls, change control names

V4L/DVB (6187): cx88-alsa: Add TLV support

V4L/DVB (6600): V4L: videobuf: don't chew up namespace STATE_.*, convert to VIDEOBUF_

Documentation

hda-codec - Add support of Zepto laptops

hda-codec - Add Dell T3400 support

ES1938 driver

es1938 - improve capture hw pointer reads

HDA Codec driver

hda-codec - Fix SPDIF output on Conexant 5045 codec

hda-codec - Allow multiple SPDIF devices

hda-codec - Add SI HDMI codec support

hda-codec - Add support of Zepto laptops

hda_intel - Add model quirk for Albatron KI690-AM2 motherboard

HDA - Add support for the OQO Model 2

hda-codec - Control SPDIF as slave

hda-codec - Add model for HP DV9553EG laptop

hda-codec - Add Dell T3400 support

hda: Add GPIO mute support to STAC9205

hda: fix Mic in as output

HDA Intel driver

HDA - enable snoop on SCH

hda_intel: ALSA HD Audio patch for Intel ICH10 DeviceID's

HDA-Intel - Add support for Intel SCH

ICE1724 driver

ice1724 - Enable AK4114 support for Audiophile192

ice1724 - Add ADC setup in set_rate callback for Audiophile192

Intel8x0 driver

intel8x0 - Add quirk for Acer Travelmate 2310

MAINTAINERS file

2.6 kernel sync

Memalloc module

Disable memalloc proc file for older kernels

OPL3

opl3 - Fix compilation without sequencer support

PPC Keywest driver

i2c: Kill rogue driver IDs

PXA Mainstone driver

2.6 kernel sync (rest)

RME HDSP driver

hdsp - Fix section mismatch

SAA7134 driver

V4L/DVB (6666): saa7134-alsa: fix period handling

V4L/DVB (6690): saa7134: fix ignored interrupts

V4L/DVB (6623): remove saa7134-oss

2.6 kernel sync (rest)

SoC Audio for the Samsung S3C24XX chips

i2c: normal_i2c can be made const (remaining drivers)

SoC Codec CS4270

i2c: normal_i2c can be made const (remaining drivers)

SoC Codec WM8753

soc - Mono voice playback volume for WM8753

SoC SH7760 AC97

Add SUPERH depends to sound/soc/sh/Kconfig

USB caiaq

caiaq - Fix section mismatch

USB generic driver

race between disconnect and error handling in usbmidi

USB1400 touchscreen driver

2.6 kernel sync (rest)

pci_ids.h update

2.6 kernel sync

alsa-lib

Core

Fix wrong exported functions

Remove obsolete instr check in configure

Control API

Fix build with --disable-hwdep and co

Configuration

Add the missing card alias for Prodigy71Hifi

Detailed changelog between 1.0.15 and 1.0.16 releases

alsa-tools

ac3dec (Dolby Digital Decoder)

- support for dynamic 2.0/5.1 AC3 changes - bug#3441

hdspconf

- Fix a small memleak

Added the forgotten free. ALSA bug#3687

https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3687

hdspmixer

- hdspmixer - Fix compilation with gcc4.3

Fixed the doubled parameter 'w'. Yeah, gcc 4.3 is picky.

- hdspmixer - small memory leak fix

ALSA bug#3687

https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3687

the hdspmixer application leaks one memory block, a c-style string

which is obtained by snd_card_get_longname, but never freed ...

- hdspmixer - Automatic initialization of secondary cards

From debian bug#450805:

We are using Hammerfall DSP cards. After booting, their audio output

remains silent until hdspmixer is started. No interaction in the GUI

of hdspmixer is necessary to unmute the first HDSP card; however,

further cards are only unmuted when activating the respective GUI

page ("2", "3"). Apparently, hdspmixer does some automatic

initialization of the card when activating the page.

Since we'd like to have a fully automatic startup, the following

patch activates the page for each existing card on startup, thereby

initializing them. There are surely more elegant solutions, but this

patch is tested and solves the problem for us.

sbiload

- sbiload - Rewritten to use hwdep device

Major rewritten to use hwdep device instead of instrument layer.

Also, more options (-c, -2, -q, -D) and better guess work for

patch types now.

Detailed changelog between 1.0.15rc1 and 1.0.16 releases

alsa-plugins

Core

- release 1.0.16rc1

- release 1.0.15

- release 1.0.15rc1

PulseAudio -> ALSA plugin

- PulseAudio plugin: report XRUN state back to application

From: Lennart Poettering <mznyfn@0pointer.de>

It adds support to report back XRUN to the application if one

happens. This is required to make some applications work on top of the

pulse plugin. One being XMMS, which checks if a song finished to play

by waiting for an XRUN (yes, I don't argue that XMMS shouldn't do

that, but nonetheless it is a good thing if XRUNs are reported

properly.)

- Fix wrong assert in pulse plugin

assert(!pcm->stream) shouldn't be checked when the PCM state is

SETUP, too (ALSA bug#3470).

The original patch by Mike Gorse <mgorse@mgorse.dhs.org>

- Use different buffer metrics in the PulseAudio plugin

It increases the "pre-buffering level" (i.e. start threshold) to the

full buffer size minus one period. This makes PA work a little bit

more like normal audio devices, and makes a few drop outs go away for

software which uses very small period sizes.

It also increases the initial maximum buffer size, which allows a

small overcommit. That's not really an issue, but cleaner nonetheless

so I smuggled it into this patch.

Also reported in the ALSA BTS:

https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3578

From: Lennart Poettering <mznyfn@0pointer.de>

- Fix unexpected assert with pulse plugin

This patch fixes the unexpected assert call at calling snd_pcm_hw_params

in PREPARED state. Since multiple hw_params calls are allowed, the pulse

plugin shouldn't call assert.

Handled in ALSA bug#3470.

From: Sean McNamara <smcnam@gmail.com>

- pulse - Add minmax condition for period_bytes and periods

Added the minmax conditions for period_bytes and periods to pulse plugin.

This fixes ALSA bug#2601.

Patch from Mike Gorse <mgorse@mgorse.dhs.org>

alsa-utils

Core

- Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz

- alsactl - restore dB level

When alsactl saved state has dB level information and an attribute

of a control element is changed after save (e.g. volume range is

changed), try to restore the values to keep the same dB level.

This change requires the new alsa-lib functions for TLV dB

conversion, so we check it in configure (until AM_PATH_ALSA(1.0.16)

works).

ALSA Control (alsactl)

- alsactl - Fix wrong restore

Fix a bug in alsactl that restores wrong values for elements with

multiple channels (counts).

- alsactl: skip inactive controls

When using alsactl to save or restore the card settings, it currently

skips over controls that don't have the appropriate read/write

permissions. It should also skip over inactive controls, otherwise it

will get an error when it tries to access that control, and will fail to

save the card state (or fully restore it.)

From: Dave Dillow <dave@thedillows.org>

- alsactl - fix double entry of comment.tlv

The entry comment.tlv can be doubly written via alsactl store, and this

results in an error. I forgot to remove the old code...

- Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz

- alsactl - Set -F option as default

Set -F option as default for restore. There are still too many systems

that are too lazy to set -F option...

Added the new -P option to back to the old behavior.

- Make alsactl restore a bit more robust

Make "alsactl restore" a bit more robust. Now it tries to parse the

compound items in the case that the number of channels was changed.

The former mono-value is expanded to all channels.

- alsactl - restore dB level

When alsactl saved state has dB level information and an attribute

of a control element is changed after save (e.g. volume range is

changed), try to restore the values to keep the same dB level.

This change requires the new alsa-lib functions for TLV dB

conversion, so we check it in configure (until AM_PATH_ALSA(1.0.16)

works).

Speaker Test

- speaker-test - Fix number of periods to play

The number of periods to play in pink and sine modes could be calculated

as zero, which results in just silence. Make the minimal value 1.

- speaker-test - Put errors to stderr

Error messages should be shown in stderr.

- Remove xfer_align

The xfer_align is the obsolete feature now. Remove it from aplay

and speaker-test to avoid deprecated calls.

alsamixer

- alsamixer: add 8-channel support

Add support for playback volume controls with 8 channels.

This allows controlling the side channels on 7.1 devices.

- Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz

amixer

- Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz

aplay/arecord

- aplay - Reset non-blocking flag before snd_pcm_drain()

snd_pcm_drain() doesn't block when running with O_NONBLOCK.

Reset the non-blocking mode before calling snd_pcm_drain() properly

(and restore again for any further operations).

- Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz

- Remove sleep_min from aplay

The sleep_min is the obsolete feature now. Remove it from aplay.

- Remove xfer_align

The xfer_align is the obsolete feature now. Remove it from aplay

and speaker-test to avoid deprecated calls.

aplaymidi/arecordmidi

- arecordmidi: mention SMF type in man page

Document the SMF type (0 or 1) that will be generated by arecordmidi.

aseqnet

- Add missing inclusion of assert.h

iecset

- iecset: fix card index check

Allow card indices up to 31.

- iecset - Add -n option

Added -n option to iecset to specify the index number of the control

element. This is needed for handling multiple SPDIF devices.

alsa-firmware

AudioScience ASIHPI Firmware

- asihpi - update firmwares for asihpi30905

dsp6413.bin is replaced by dsp6400.bin, dsp8713 by dsp8700.

The irrelevant dsp2400 is removed, too.

Also removed all dsp*.txt that are not needed.

- asihpi firmware update for verion 3.09.09

- add record format check for supported format.

- ASI6500/6500 - fix issue arising from back-to-back- adapter sample rate

changes.

- ASI6000 - fix rare MP3 decode bug.

- ASI6585 - add support for clock source Livewire.

- ASI6416 - re-order control creation.

Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>

Emagic EMI 2|6 Audio Interface Firmware

- emi26: complete license.txt

Add a paragraph from linux/drivers/usb/misc/emi26_fw.h that was missing

in license.txt.

Detailed changelog between 1.0.16rc2 and 1.0.16 releases

alsa-driver

Sound Core

- Check __ffs in configure script for older kernels

- release 1.0.16

- release 1.0.16rc2

ALSA Core

- Check __ffs in configure script for older kernels

ALSA<-OSS emulation

- Add more fallbacks to OSS PHONEOUT mixer map

Added more fallbacks to OSS PHONEOUT mixer mapping. This corresponds

to the speaker output in general, so now "Mono" and "Speaker" are

assigned.

- Fix Oops with PCM OSS sync

The PCM OSS emulation can cause Oops at sync operation due to the wrong

data size calculation. Typically happening on Sparc64:

http://lkml.org/lkml/2008/1/24/426

Asihpi driver

- asihpi version 3.09.09

Main changes in this set:

* Redo comment formatting so block comments are properly indented with code

(bulk of changes)

hpifunc.c:

* Remove HPI_UNUSED macro from hpifunc

* Remove error->string translation, hence strcpy

hpios_linux_kernel.*

* Remove use of slab cache for DMA memory allocation tracking

hpicmn.*:

* Rename some functions to give Hpi prefix, made others static

hpimod.c

* Replace semaphore with mutex

* Make driver cleanup more 'normal'

hpi6205.c hpi6000.c hpimsgx.c

* Pull some error handling up into hpimsgx.c

Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>

CMI8788 (Oxygen) driver

- oxygen - Fix section mismatch

Removed invalid __devinit and __devexit that are remaining after

split to a helper module.

- oxygen: fix line-in recording selection

The GPIO pin 0 of the CM9780 must be set when muting the line input even

on non-Xonar cards.

- oxygen: revert SPI clock frequency change for AK4396/WM8785

While the AK4396 and WM8785 datasheets say that the SPI clock cycle

length must be at least 200 ns, 320 ns seems not to work reliably with

the controller, so we better use 160 ns.

CREDITS file

- 2.6 kernel sync

CX88 driver

- V4L/DVB (6185): cx88-alsa: Add mute controls, change control names

Add two mute controls. One mutes everything, the other just mutes the analog

pass-through output.

Rename the existing volume control. The controls are now:

Playback Volume

Playback Switch

Capture Switch

These names might seem odd, but I believe they are more correct. The previous

"Capture Volume" control didn't actually effect the volume of the captured

audio. Instead it controls the volume of the analog pass-thought output. It

appears that pass-through controls like this are usually considered to be in

the playback direction, not capture. For example, "CAPTURE feedback Playback

Volume" is the name used for a control that appears to have the same effect in

the ca0106 driver. We only have one volume control, so we can omit the

"CAPTURE feedback" part.

If someone where to add PCM playback support to the driver, then this

would be the volume control.

Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

- V4L/DVB (6187): cx88-alsa: Add TLV support

Lets mixer apps display a dB range for the volume control.

Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

- V4L/DVB (6600): V4L: videobuf: don't chew up namespace STATE_.*, convert to VIDEOBUF_

s/STATE_NEEDS_INIT/VIDEOBUF_NEEDS_INIT/g

s/STATE_PREPARED/VIDEOBUF_PREPARED/g

s/STATE_QUEUED/VIDEOBUF_QUEUED/g

s/STATE_ACTIVE/VIDEOBUF_ACTIVE/g

s/STATE_DONE/VIDEOBUF_DONE/g

s/STATE_ERROR/VIDEOBUF_ERROR/g

s/STATE_IDLE/VIDEOBUF_IDLE/g

Signed-off-by: Brandon Philips <bphilips@suse.de>

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

Documentation

- hda-codec - Add support of Zepto laptops

Adds support for zepto laptops with alc268 intel_hda codec.

Signed-off-by: Mirco Tischler <mt-ml@gmx.de>

- hda-codec - Add Dell T3400 support

Added the support for Dell T3400 with AD1984 codec chip.

ALSA bug#3699:

https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3699

Signed-off-by: Douglas Kosovic <douglask@itee.uq.edu.au>

ES1938 driver

- es1938 - improve capture hw pointer reads

With the Solo1 (es1938) I got a lot of xrun's during capture on my machine.

Tracing that down it seems to be comming from reading ocassionaly bad hw

pointers from the chip. This patch uses more checking to avoid that false

pointer reads.

Failed reads are giving back the last good value read instead of spinning in

a tight loop, which seems more appropriate to me in an interrupt. I think I

saw this trick used in another driver

Signed-off-by: Hermann Lauer <Hermann.Lauer@iwr.uni-heidelberg.de>

HDA Codec driver

- hda-codec - Fix SPDIF output on Conexant 5045 codec

Fixed the SPDIF output on Conexant Cx5045 codec. Added the missing

pin output setting and fixed the wrong NID for digital audio-out widget.

- hda-codec - Allow multiple SPDIF devices

The current code doesn't allow multiple SPDIF devices, and causes

errors when multiple SPDIF devices are found (e.g. SPDIF out and HDMI).

This patch allows multiple SPDIF devices by incrementing the index

automatically.

- hda-codec - Add SI HDMI codec support

Added the support of SI HDMI codec, found in ASUS machines.

ALSA bug#3654

https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3654

- hda-codec - Add support of Zepto laptops

Adds support for zepto laptops with alc268 intel_hda codec.

Signed-off-by: Mirco Tischler <mt-ml@gmx.de>

- hda_intel - Add model quirk for Albatron KI690-AM2 motherboard

This adds a quirk to the Realtek ALC883 table for the Albatron KI690-AM2

motherboard to use the 6stack-dig model.

Signed-off-by: Andrew Paprocki <andrew@ishiboo.com>

- HDA - Add support for the OQO Model 2

This patch adds support for the OQO Model 2 Ultra Mobile PC.

Signed-off-by: Tobin Davis <tdavis@dsl-only.net>

- hda-codec - Control SPDIF as slave

Add SPDIF playback switch to the slave element list so that it

can be toggled via the master control as well.

- hda-codec - Add model for HP DV9553EG laptop

Added the proper model for HP DV9553EG laptop with Cxt5045.

ALSA bug#3534

https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3534

- hda-codec - Add Dell T3400 support

Added the support for Dell T3400 with AD1984 codec chip.

ALSA bug#3699:

https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3699

Signed-off-by: Douglas Kosovic <douglask@itee.uq.edu.au>

- hda: Add GPIO mute support to STAC9205

Support added for detecting HP jack presence via GPIO on several laptop docks.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>

- hda: fix Mic in as output

Some laptop has an internal analog microphone that is 'fixed'.

This patch prevents creating a 'Mic In as Output' switch for

ports that can't be outputs.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>

HDA Intel driver

- HDA - enable snoop on SCH

This patch enables snoop on Intel SCH chipset, eliminating static during

playback.

Signed-off-by: Tobin Davis <tdavis@dsl-only.net>

- hda_intel: ALSA HD Audio patch for Intel ICH10 DeviceID's

This patch adds the Intel ICH10 HD Audio Controller DeviceID's.

Signed-off-by: Jason Gaston <jason.d.gaston@intel.com>

- HDA-Intel - Add support for Intel SCH

This patch adds support for Intel's SCH mobile chipset.

Signed-off-by: Tobin Davis <tdavis@dsl-only.net>

ICE1724 driver

- ice1724 - Enable AK4114 support for Audiophile192

Fixed and enabled the support of AK4114 chip on Audiophile192.

- ice1724 - Add ADC setup in set_rate callback for Audiophile192

Added the missing GPIO setup for the AK5385A ADC codec on Audiophile192.

Intel8x0 driver

- intel8x0 - Add quirk for Acer Travelmate 2310

Added ac97_quirk=hp-only for Acer Travelmate 2310.

ALSA bug#3656

https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3656

MAINTAINERS file

- 2.6 kernel sync

Memalloc module

- Disable memalloc proc file for older kernels

... otherwise we get build errors.

OPL3

- opl3 - Fix compilation without sequencer support

Add proper ifdef's to the patch loading code moved from the old instr

layer so that opl3 driver can be compiled without the sequencer support.

PPC Keywest driver

- i2c: Kill rogue driver IDs

I2C driver IDs are optional, so if you don't need one, just omit it.

Signed-off-by: Jean Delvare <khali@linux-fr.org>

PXA Mainstone driver

- 2.6 kernel sync (rest)

RME HDSP driver

- hdsp - Fix section mismatch

Removed invalid __devinit from hdsp_request_fw_loader() and

snd_hwdep_create_hwdep() that aren't always init functions.

SAA7134 driver

- V4L/DVB (6666): saa7134-alsa: fix period handling

The period handling in saa7134-alsa is broken in two ways. First, the

minimum number of periods of two does not work, because the dma is setup

two periods ahead in the irq handler. Fix the minimum to four periods.

Second, the code assumes that the number of periods is divisible by two,

which isn't always the case on ALSA. Fix by adding a constraint.

Signed-off-by: Heikki Lindholm <holindho@cs.helsinki.fi>

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

- V4L/DVB (6690): saa7134: fix ignored interrupts

The saa7134 video driver starts dropping frames when used together with the

saa7134-alsa driver. Frames are dropped because when an audio event is waiting

the driver simply ignores the interrupt and passes it on to the saa7134-alsa

interrupt handler. The alsa interrupt handler in turn acknowledges all types

of events thus clearing the pending video events as well. Fix by only masking

out the audio event in the video interrupt handler and by only acknowledging

the audio event in the alsa driver.

Signed-off-by: Heikki Lindholm <holindho@cs.helsinki.fi>

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

- V4L/DVB (6623): remove saa7134-oss

The saa7134-oss is deprecated for quite some time, it's the only remaining OSS

user outside of sound/oss/, and considering how few and what kind of

soundcards are left supported by OSS I hardly see any use cases left.

Signed-off-by: Adrian Bunk <bunk@kernel.org>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

- 2.6 kernel sync (rest)

SoC Audio for the Samsung S3C24XX chips

- i2c: normal_i2c can be made const (remaining drivers)

Signed-off-by: Jean Delvare <khali@linux-fr.org>

SoC Codec CS4270

- i2c: normal_i2c can be made const (remaining drivers)

Signed-off-by: Jean Delvare <khali@linux-fr.org>

SoC Codec WM8753

- soc - Mono voice playback volume for WM8753

Voice playback volume is in register bits 0:2, not 4:6.

From: Mike Montour <mail@mmontour.net>

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Cc: Werner Almesberger <werner@openmoko.org>

SoC SH7760 AC97

- Add SUPERH depends to sound/soc/sh/Kconfig

Currently you will see an empty "SoC Audio support for SuperH" menu

when building for other archs (example pxa).

This patch adds "depends on SUPERH" to remove that empty menu.

Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>

USB caiaq

- caiaq - Fix section mismatch

Removed invalid __devinit* causing section mismatch errors.

USB generic driver

- race between disconnect and error handling in usbmidi

The driver resubmits URBs from an error handler and schedules the error

handler from the URBs' completion handlers. To reliably kill the cycle

a flag must be used.

Signed-off-by: Oliver Neukum <oneukum@suse.de>

USB1400 touchscreen driver

- 2.6 kernel sync (rest)

pci_ids.h update

- 2.6 kernel sync

alsa-lib

Core

- Fix wrong exported functions

The internal functions (as alias of 0.9.0rc4 variants) must be

exported but they were wrongly listed in Versions file.

Fixed the function names now.

- Remove obsolete instr check in configure

Control API

- Fix build with --disable-hwdep and co

control.h has function declarations with hwdep or rawmidi types

that aren't included when built without the corresponding supports.

Add ifdef appropriately to fix this.

Configuration

- Add the missing card alias for Prodigy71Hifi

See ALSA bug#3735

https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3735