From 7567f38c8fb22b8aa8114e986b1aa7003e64f0b8 Mon Sep 17 00:00:00 2001
From: Ariff Abdullah <ariff@FreeBSD.org>
Date: Sat, 30 Sep 2006 01:24:22 +0000
Subject: [PATCH] Nuke OSSV4_EXPERIMENT ifdefs from kludgy MIXER_SIZE
 definition since the exclusion of sizeof(oss_mixer_enuminfo) is the real
 cause of overflow (worth of +3000 bytes).

Noticed by:	tegge
---
 sys/dev/sound/pcm/mixer.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sys/dev/sound/pcm/mixer.h b/sys/dev/sound/pcm/mixer.h
index 65a4178991c..09f4b60a183 100644
--- a/sys/dev/sound/pcm/mixer.h
+++ b/sys/dev/sound/pcm/mixer.h
@@ -52,11 +52,7 @@ extern int mixer_count;
  * this is a kludge to allow hiding of the struct snd_mixer definition
  * 512 should be enough for all architectures
  */
-#ifdef OSSV4_EXPERIMENT
 # define	MIXER_SIZE	(512 + sizeof(struct kobj) + \
 				 sizeof(oss_mixer_enuminfo))
-#else
-# define	MIXER_SIZE	(512 + sizeof(struct kobj))
-#endif
 
 #define MIXER_DECLARE(name) static DEFINE_CLASS(name, name ## _methods, MIXER_SIZE)