diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /sound/isa/ad1848/ad1848.c | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'sound/isa/ad1848/ad1848.c')
| -rw-r--r-- | sound/isa/ad1848/ad1848.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/ad1848/ad1848.c b/sound/isa/ad1848/ad1848.c index 99908e44124d..74e501dea8b1 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 | |||
| 65 | static struct platform_device *devices[SNDRV_CARDS]; | 65 | static struct platform_device *devices[SNDRV_CARDS]; |
| 66 | 66 | ||
| 67 | 67 | ||
| 68 | static int __init snd_ad1848_probe(struct platform_device *pdev) | 68 | static int __devinit snd_ad1848_probe(struct platform_device *pdev) |
| 69 | { | 69 | { |
| 70 | int dev = pdev->id; | 70 | int dev = pdev->id; |
| 71 | struct snd_card *card; | 71 | struct snd_card *card; |