diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-07-02 15:48:33 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-07-02 15:48:33 (GMT) |
| commit | 4413c8d2be530d7310feaceaae28350b316b2068 (patch) | |
| tree | 9fa645f9e32162d782fa78e16b59eaa4733055f6 /sound/pci/hda/patch_ca0110.c | |
| parent | cfbc78003e2b12e60a1d594ce192c30aea44eb2a (diff) | |
| parent | ff84847171508a3c76eb7e483204d1be7738729b (diff) | |
| download | linux-fsl-qoriq-4413c8d2be530d7310feaceaae28350b316b2068.tar.xz | |
Merge branch 'fix/hda' into for-linus
* fix/hda:
ALSA: hda - Add quirk for HP 6930p
ALSA: hda - Add missing static to patch_ca0110()
Diffstat (limited to 'sound/pci/hda/patch_ca0110.c')
| -rw-r--r-- | sound/pci/hda/patch_ca0110.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_ca0110.c b/sound/pci/hda/patch_ca0110.c index 392d108..019ca7c 100644 --- a/sound/pci/hda/patch_ca0110.c +++ b/sound/pci/hda/patch_ca0110.c @@ -510,7 +510,7 @@ static int ca0110_parse_auto_config(struct hda_codec *codec) } -int patch_ca0110(struct hda_codec *codec) +static int patch_ca0110(struct hda_codec *codec) { struct ca0110_spec *spec; int err; |