Merge branch 'for-2.6.38' into for-2.6.39

This commit is contained in:
Mark Brown 2011-02-11 11:14:20 +00:00
commit 4a5aa6e9ea

View File

@ -367,7 +367,7 @@ static int cx20442_codec_remove(struct snd_soc_codec *codec)
return 0;
}
static const u8 cx20442_reg = CX20442_TELOUT | CX20442_MIC;
static const u8 cx20442_reg;
static struct snd_soc_codec_driver cx20442_codec_dev = {
.probe = cx20442_codec_probe,