diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2011-09-23 15:26:37 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-09-23 15:26:37 +0200 |
| commit | 3127b6aa752d1329dbd79f669b53027905d1976a (patch) | |
| tree | 66358407c3ddec5a8cc4190321d03bb11522f755 /sound/soc/blackfin/bf5xx-ad73311.c | |
| parent | ALSA: usb-audio - clear chip->probing on error exit (diff) | |
| parent | ASoC: Ensure we generate a driver name (diff) | |
| download | linux-dev-3127b6aa752d1329dbd79f669b53027905d1976a.tar.xz linux-dev-3127b6aa752d1329dbd79f669b53027905d1976a.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/blackfin/bf5xx-ad73311.c')
| -rw-r--r-- | sound/soc/blackfin/bf5xx-ad73311.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/blackfin/bf5xx-ad73311.c b/sound/soc/blackfin/bf5xx-ad73311.c index 732a247f2527..b94eb7ef7d16 100644 --- a/sound/soc/blackfin/bf5xx-ad73311.c +++ b/sound/soc/blackfin/bf5xx-ad73311.c @@ -128,7 +128,7 @@ static int snd_ad73311_configure(void) return 0; } -static int bf5xx_probe(struct platform_device *pdev) +static int bf5xx_probe(struct snd_soc_card *card) { int err; if (gpio_request(GPIO_SE, "AD73311_SE")) { |