aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-02-23 08:07:15 +0100
committerTakashi Iwai <tiwai@suse.de>2010-02-23 08:07:15 +0100
commitd01aecdf900574cf6be7c1c6114e708801126baf (patch)
treeb459cab358393c3929d753974287ca9022531592 /sound/pci/hda
parent0708cc582f0fe2578eaab722841caf2b4f8cfe37 (diff)
downloadkernel_samsung_aries-d01aecdf900574cf6be7c1c6114e708801126baf.zip
kernel_samsung_aries-d01aecdf900574cf6be7c1c6114e708801126baf.tar.gz
kernel_samsung_aries-d01aecdf900574cf6be7c1c6114e708801126baf.tar.bz2
ALSA: hda - Remove identical definitions for macmini3 model
The channel mode definitions for macmini3 model are identical with mb5. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda')
-rw-r--r--sound/pci/hda/patch_realtek.c30
1 files changed, 1 insertions, 29 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index f8fb260..c74ca39 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -7008,35 +7008,7 @@ static struct hda_channel_mode alc885_mb5_6ch_modes[2] = {
{ 6, alc885_mb5_ch6_init },
};
-/*
- * 2ch
- * Speakers/Woofer/HP = Front
- * LineIn = Input
- */
-static struct hda_verb alc885_macmini3_ch2_init[] = {
- {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
- {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
- { } /* end */
-};
-
-/*
- * 6ch mode
- * Speakers/HP = Front
- * Woofer = LFE
- * LineIn = Surround
- */
-static struct hda_verb alc885_macmini3_ch6_init[] = {
- {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
- {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
- {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
- { } /* end */
-};
-
-static struct hda_channel_mode alc885_macmini3_6ch_modes[2] = {
- { 2, alc885_mb5_ch2_init },
- { 6, alc885_mb5_ch6_init },
-};
-
+#define alc885_macmini3_6ch_modes alc885_mb5_6ch_modes
/*
* 2ch mode