Merge branch 'for-linus' into for-next

Back-merged for refactoring beep stuff.

1 files changed, 2 insertions, 0 deletions

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index f772585c89ba..c0bf15554507 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -3182,6 +3182,7 @@ static int patch_alc269(struct hda_codec *codec)
         case 0x10ec0290:
                 spec->codec_variant = ALC269_TYPE_ALC280;
                 break;
+        case 0x10ec0233:
         case 0x10ec0282:
         case 0x10ec0283:
                 spec->codec_variant = ALC269_TYPE_ALC282;
@@ -3881,6 +3882,7 @@ static int patch_alc680(struct hda_codec *codec)
  */
 static const struct hda_codec_preset snd_hda_preset_realtek[] = {
         { .id = 0x10ec0221, .name = "ALC221", .patch = patch_alc269 },
+        { .id = 0x10ec0233, .name = "ALC233", .patch = patch_alc269 },
         { .id = 0x10ec0260, .name = "ALC260", .patch = patch_alc260 },
         { .id = 0x10ec0262, .name = "ALC262", .patch = patch_alc262 },
         { .id = 0x10ec0267, .name = "ALC267", .patch = patch_alc268 },