diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-02 17:33:53 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-02 17:33:53 +0100 |
| commit | 2ff38c9fbaa86264ad819117ab137361067ab5f1 (patch) | |
| tree | 154e163934796d5c82afdf0633ce3d197f6bb1f4 /sound/soc/s6000/s6000-i2s.c | |
| parent | c949e3d685b661412bfcd93d9c5956f125c1e060 (diff) | |
| parent | af745bd724e304cc94a88a2fb43d53baffbd63a5 (diff) | |
| download | kernel_replicant_linux-2ff38c9fbaa86264ad819117ab137361067ab5f1.tar.gz kernel_replicant_linux-2ff38c9fbaa86264ad819117ab137361067ab5f1.tar.bz2 kernel_replicant_linux-2ff38c9fbaa86264ad819117ab137361067ab5f1.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/s6000/s6000-i2s.c')
| -rw-r--r-- | sound/soc/s6000/s6000-i2s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/s6000/s6000-i2s.c b/sound/soc/s6000/s6000-i2s.c index 8778faa174a6..3052f64b2403 100644 --- a/sound/soc/s6000/s6000-i2s.c +++ b/sound/soc/s6000/s6000-i2s.c @@ -434,7 +434,7 @@ static struct snd_soc_dai_driver s6000_i2s_dai = { .rate_max = 1562500, }, .ops = &s6000_i2s_dai_ops, -} +}; static int __devinit s6000_i2s_probe(struct platform_device *pdev) { |