diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:50 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:50 -0400 |
| commit | e0d2054fd3cf167395390dc1758644486c782707 (patch) | |
| tree | 108fd3138f0246f5fa17454680d6d04a670ed6d8 /sound/arm | |
| parent | d807500a2472445d05ce641bf09438e3d72eeb4f (diff) | |
| parent | c468ac29e63b9927275a94379d00b367f0f97c43 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/arm')
| -rw-r--r-- | sound/arm/sa11xx-uda1341.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c index 51d708c31e65..7101d3d8bae6 100644 --- a/sound/arm/sa11xx-uda1341.c +++ b/sound/arm/sa11xx-uda1341.c | |||
| @@ -915,7 +915,7 @@ static int __devinit sa11xx_uda1341_probe(struct platform_device *devptr) | |||
| 915 | snd_card_set_dev(card, &devptr->dev); | 915 | snd_card_set_dev(card, &devptr->dev); |
| 916 | 916 | ||
| 917 | if ((err = snd_card_register(card)) == 0) { | 917 | if ((err = snd_card_register(card)) == 0) { |
| 918 | printk( KERN_INFO "iPAQ audio support initialized\n" ); | 918 | printk(KERN_INFO "iPAQ audio support initialized\n"); |
| 919 | platform_set_drvdata(devptr, card); | 919 | platform_set_drvdata(devptr, card); |
| 920 | return 0; | 920 | return 0; |
| 921 | } | 921 | } |