git: ea4182876ac5 - stable/15 - sound: Retire SND_OLDSTEREO

The branch stable/15 has been updated by christos:

URL: https://cgit.FreeBSD.org/src/commit/?id=ea4182876ac56ce5d9e27914392a078593b04c3e

commit ea4182876ac56ce5d9e27914392a078593b04c3e
Author:     Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2026-03-24 10:31:22 +0000
Commit:     Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2026-03-31 09:53:16 +0000

    sound: Retire SND_OLDSTEREO
    
    This is a legacy option and does not serve a good purpose anymore.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Reviewed by:    markj
    Differential Revision:  https://reviews.freebsd.org/D55933
    
    (cherry picked from commit bf0e5d987ecd2cbec2200e100bad6d6e724e9315)
---
 sys/conf/NOTES             | 4 ----
 sys/conf/options           | 1 -
 sys/dev/sound/pcm/matrix.h | 3 ---
 3 files changed, 8 deletions(-)

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index c66abd138b10..e27ee07ff7c1 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2174,15 +2174,11 @@ envvar		hint.gusc.0.flags="0x13"
 #                              integer/arithmetic. Slight increase of dynamic
 #                              range at a cost of possible slowdown.
 #
-# SND_OLDSTEREO                Only 2 channels are allowed, effectively
-#                              disabling multichannel processing.
-#
 options 	SND_DIAGNOSTIC
 options 	SND_FEEDER_MULTIFORMAT
 options 	SND_FEEDER_FULL_MULTIFORMAT
 options 	SND_FEEDER_RATE_HP
 options 	SND_PCM_64
-options 	SND_OLDSTEREO
 
 #
 # Cardbus
diff --git a/sys/conf/options b/sys/conf/options
index 744da1e394de..8f5465cac832 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -924,7 +924,6 @@ SND_FEEDER_MULTIFORMAT	opt_snd.h
 SND_FEEDER_FULL_MULTIFORMAT	opt_snd.h
 SND_FEEDER_RATE_HP	opt_snd.h
 SND_PCM_64		opt_snd.h
-SND_OLDSTEREO		opt_snd.h
 
 X86BIOS
 
diff --git a/sys/dev/sound/pcm/matrix.h b/sys/dev/sound/pcm/matrix.h
index e2798c651536..ff5f05e477e4 100644
--- a/sys/dev/sound/pcm/matrix.h
+++ b/sys/dev/sound/pcm/matrix.h
@@ -29,10 +29,7 @@
 #ifndef _SND_MATRIX_H_
 #define _SND_MATRIX_H_
 
-#undef SND_MULTICHANNEL
-#ifndef SND_OLDSTEREO
 #define SND_MULTICHANNEL	1
-#endif
 
 /*
  * XXX = unused, but part of the definition (will be used someday, maybe).