forked from analogdevicesinc/linux
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/p…
…erex/alsa * 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (122 commits) [ALSA] version 1.0.14rc4 [ALSA] Add speaker pin sequencing to hda_codec.c:snd_hda_parse_pin_def_config() [ALSA] hda-codec - Add ALC861VD Lenovo support [ALSA] hda-codec - Fix connection list in generic parser [ALSA] usb-audio: work around wrong wMaxPacketSize on ESI M4U [ALSA] usb-audio: work around broken M-Audio MidiSport Uno firmware [ALSA] usb-audio: explicitly match Logitech QuickCam [ALSA] hda-codec - Fix a typo [ALSA] hda-codec - Fix ALC880 uniwill auto-mutes [ALSA] hda-codec - Fix AD1988 SPDIF playback route control [ALSA] wm8750 typo fix [ALSA] wavefront: only declare isapnp on CONFIG_PNP [ALSA] hda-codec - bug fixes for stac92xx HDA codecs. [ALSA] add MODULE_FIRMWARE entries [ALSA] do not depend on FW_LOADER when internal firmware images are used [ALSA] hda-codec - Fix resume of STAC92xx codecs [ALSA] usbaudio - Revert the minimal period size fix patch [ALSA] hda-codec - Add support for new HP DV series laptops [ALSA] usb-audio - Fix the minimum period size per transfer mode [ALSA] sound/pcmcia/vx/vxpocket.c: fix an if() condition ...
- Loading branch information
Showing
169 changed files
with
10,638 additions
and
5,531 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -372,7 +372,7 @@ AOA (Apple Onboard Audio) ALSA DRIVER | |
P: Johannes Berg | ||
M: [email protected] | ||
L: [email protected] | ||
L: [email protected] | ||
L: [email protected] (subscribers-only) | ||
S: Maintained | ||
|
||
APM DRIVER | ||
|
@@ -3239,13 +3239,13 @@ S: Maintained | |
SOUND | ||
P: Jaroslav Kysela | ||
M: [email protected] | ||
L: [email protected] | ||
L: [email protected] (subscribers-only) | ||
S: Maintained | ||
|
||
SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT | ||
P: Liam Girdwood | ||
M: [email protected] | ||
L: [email protected] | ||
L: [email protected] (subscribers-only) | ||
S: Supported | ||
|
||
SPI SUBSYSTEM | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
/* include/version.h. Generated by alsa/ksync script. */ | ||
#define CONFIG_SND_VERSION "1.0.14rc3" | ||
#define CONFIG_SND_DATE " (Wed Mar 14 07:25:50 2007 UTC)" | ||
#define CONFIG_SND_VERSION "1.0.14rc4" | ||
#define CONFIG_SND_DATE " (Wed May 09 09:51:39 2007 UTC)" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,9 +23,6 @@ | |
MODULE_LICENSE("GPL"); | ||
MODULE_AUTHOR("Johannes Berg <[email protected]>"); | ||
MODULE_DESCRIPTION("Apple Soundbus: I2S support"); | ||
/* for auto-loading, declare that we handle this weird | ||
* string that macio puts into the relevant device */ | ||
MODULE_ALIAS("of:Ni2sTi2sC"); | ||
|
||
static int force; | ||
module_param(force, int, 0444); | ||
|
@@ -37,6 +34,8 @@ static struct of_device_id i2sbus_match[] = { | |
{ } | ||
}; | ||
|
||
MODULE_DEVICE_TABLE(of, i2sbus_match); | ||
|
||
static int alloc_dbdma_descriptor_ring(struct i2sbus_dev *i2sdev, | ||
struct dbdma_command_mem *r, | ||
int numcmds) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.