aboutsummaryrefslogtreecommitdiff
path: root/sound/isa/ad1848/ad1848.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-14 09:51:20 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-14 09:51:20 -0800
commit724339d76d9407cd1a8ad32a9c1fdf64840cc51b (patch)
tree21461971804ffaa22cf4defdba965474da705463 /sound/isa/ad1848/ad1848.c
parent414f827c46973ba39320cfb43feb55a0eeb9b4e8 (diff)
parentccf2c2229d4473cc1a334200c1b60ab6070adabe (diff)
Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: [ALSA] version 1.0.14rc2 [ALSA] Fix a typo in __dev* changes in portman2x4.c [ALSA] Change AT91 PDC register defines for 2.6.20 kernel [ALSA] SoC codecs - fix Kconfig - depends -> depends on [ALSA] Fix __devinit and __devexit issues with sound drivers [ALSA] hda-codec - Patch for enabling LFE on more Dell laptops [ALSA] hda-codec - More fixes for Conexant HD Audio support [ALSA] usb-audio: add PCR-A PCM support [ALSA] emu10k1: fix typo [ALSA] usbaudio - remove urb->bandwidth reference [ALSA] ac97 - Fix silent output problem with Cx20551 codec [ALSA] hda-codec - Fix Oops with probing sigmatel codec chips
Diffstat (limited to 'sound/isa/ad1848/ad1848.c')
-rw-r--r--sound/isa/ad1848/ad1848.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/ad1848/ad1848.c b/sound/isa/ad1848/ad1848.c
index 99908e44124..74e501dea8b 100644
--- a/sound/isa/ad1848/ad1848.c
+++ b/sound/isa/ad1848/ad1848.c
@@ -65,7 +65,7 @@ MODULE_PARM_DESC(thinkpad, "Enable only for the onboard CS4248 of IBM Thinkpad 3
static struct platform_device *devices[SNDRV_CARDS];
-static int __init snd_ad1848_probe(struct platform_device *pdev)
+static int __devinit snd_ad1848_probe(struct platform_device *pdev)
{
int dev = pdev->id;
struct snd_card *card;