diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 13:59:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 13:59:37 -0400 |
commit | e4980371059ca4a81ccdcb4381c41af8869ca711 (patch) | |
tree | 29758f7e8d66b5866d9d3897eff12f122000b4d7 /Documentation/DocBook | |
parent | 9d1c02135516866cbbb2f80e20cfb65c63a3ce40 (diff) | |
parent | 76531d4166fb620375ff3c1ac24753265216d579 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (297 commits)
ALSA: asihpi - Replace with snd_ctl_boolean_mono_info()
ALSA: asihpi - HPI version 4.08
ALSA: asihpi - Add volume mute controls
ALSA: asihpi - Control name updates
ALSA: asihpi - Use size_t for sizeof result
ALSA: asihpi - Explicitly include mutex.h
ALSA: asihpi - Add new node and message defines
ALSA: asihpi - Make local function static
ALSA: asihpi - Fix minor typos and spelling
ALSA: asihpi - Remove unused structures, macros and functions
ALSA: asihpi - Remove spurious adapter index check
ALSA: asihpi - Revise snd_pcm_debug_name, get rid of DEBUG_NAME macro
ALSA: asihpi - DSP code loader API now independent of OS
ALSA: asihpi - Remove controlex structs and associated special data transfer code
ALSA: asihpi - Increase request and response buffer sizes
ALSA: asihpi - Give more meaningful name to hpi request message type
ALSA: usb-audio - Add quirk for Roland / BOSS BR-800
ALSA: hda - Remove a superfluous argument of via_auto_init_output()
ALSA: hda - Fix indep-HP path (de-)activation for VT1708* codecs
ALSA: hda - Add documentation for codec-specific mixer controls
...
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r-- | Documentation/DocBook/writing-an-alsa-driver.tmpl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/DocBook/writing-an-alsa-driver.tmpl b/Documentation/DocBook/writing-an-alsa-driver.tmpl index 58ced2346e67..598c22f3b3ac 100644 --- a/Documentation/DocBook/writing-an-alsa-driver.tmpl +++ b/Documentation/DocBook/writing-an-alsa-driver.tmpl | |||
@@ -1164,7 +1164,7 @@ | |||
1164 | } | 1164 | } |
1165 | chip->port = pci_resource_start(pci, 0); | 1165 | chip->port = pci_resource_start(pci, 0); |
1166 | if (request_irq(pci->irq, snd_mychip_interrupt, | 1166 | if (request_irq(pci->irq, snd_mychip_interrupt, |
1167 | IRQF_SHARED, "My Chip", chip)) { | 1167 | IRQF_SHARED, KBUILD_MODNAME, chip)) { |
1168 | printk(KERN_ERR "cannot grab irq %d\n", pci->irq); | 1168 | printk(KERN_ERR "cannot grab irq %d\n", pci->irq); |
1169 | snd_mychip_free(chip); | 1169 | snd_mychip_free(chip); |
1170 | return -EBUSY; | 1170 | return -EBUSY; |
@@ -1197,7 +1197,7 @@ | |||
1197 | 1197 | ||
1198 | /* pci_driver definition */ | 1198 | /* pci_driver definition */ |
1199 | static struct pci_driver driver = { | 1199 | static struct pci_driver driver = { |
1200 | .name = "My Own Chip", | 1200 | .name = KBUILD_MODNAME, |
1201 | .id_table = snd_mychip_ids, | 1201 | .id_table = snd_mychip_ids, |
1202 | .probe = snd_mychip_probe, | 1202 | .probe = snd_mychip_probe, |
1203 | .remove = __devexit_p(snd_mychip_remove), | 1203 | .remove = __devexit_p(snd_mychip_remove), |
@@ -1340,7 +1340,7 @@ | |||
1340 | <programlisting> | 1340 | <programlisting> |
1341 | <![CDATA[ | 1341 | <![CDATA[ |
1342 | if (request_irq(pci->irq, snd_mychip_interrupt, | 1342 | if (request_irq(pci->irq, snd_mychip_interrupt, |
1343 | IRQF_SHARED, "My Chip", chip)) { | 1343 | IRQF_SHARED, KBUILD_MODNAME, chip)) { |
1344 | printk(KERN_ERR "cannot grab irq %d\n", pci->irq); | 1344 | printk(KERN_ERR "cannot grab irq %d\n", pci->irq); |
1345 | snd_mychip_free(chip); | 1345 | snd_mychip_free(chip); |
1346 | return -EBUSY; | 1346 | return -EBUSY; |
@@ -1616,7 +1616,7 @@ | |||
1616 | <programlisting> | 1616 | <programlisting> |
1617 | <![CDATA[ | 1617 | <![CDATA[ |
1618 | static struct pci_driver driver = { | 1618 | static struct pci_driver driver = { |
1619 | .name = "My Own Chip", | 1619 | .name = KBUILD_MODNAME, |
1620 | .id_table = snd_mychip_ids, | 1620 | .id_table = snd_mychip_ids, |
1621 | .probe = snd_mychip_probe, | 1621 | .probe = snd_mychip_probe, |
1622 | .remove = __devexit_p(snd_mychip_remove), | 1622 | .remove = __devexit_p(snd_mychip_remove), |
@@ -5816,7 +5816,7 @@ struct _snd_pcm_runtime { | |||
5816 | <programlisting> | 5816 | <programlisting> |
5817 | <![CDATA[ | 5817 | <![CDATA[ |
5818 | static struct pci_driver driver = { | 5818 | static struct pci_driver driver = { |
5819 | .name = "My Chip", | 5819 | .name = KBUILD_MODNAME, |
5820 | .id_table = snd_my_ids, | 5820 | .id_table = snd_my_ids, |
5821 | .probe = snd_my_probe, | 5821 | .probe = snd_my_probe, |
5822 | .remove = __devexit_p(snd_my_remove), | 5822 | .remove = __devexit_p(snd_my_remove), |