Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 887f9f02 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] Remove ifdefs from OSS PCM emulation codes 



Fix Makefile to compile files conditionally to CONFIG_SND_PCM_OSS_PLUGINS,
and remove unneeded ifdefs in these files.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent a110133d

sound/core/oss/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ 


snd-mixer-oss-objs := mixer_oss.o



snd-pcm-oss-objs := pcm_oss.o pcm_plugin.o \

snd-pcm-oss-y := pcm_oss.o

snd-pcm-oss-$(CONFIG_SND_PCM_OSS_PLUGINS) += pcm_plugin.o \

	io.o copy.o linear.o mulaw.o route.o rate.o



obj-$(CONFIG_SND_MIXER_OSS) += snd-mixer-oss.o

sound/core/oss/copy.c

+0 −5
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ 
 */



#include <sound/driver.h>



#ifdef CONFIG_SND_PCM_OSS_PLUGINS



#include <linux/time.h>

#include <sound/core.h>

#include <sound/pcm.h>
@@ -88,5 +85,3 @@ int snd_pcm_plugin_build_copy(struct snd_pcm_substream *plug, 
	*r_plugin = plugin;

	return 0;

}
 


#endif

sound/core/oss/io.c

+0 −5
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ 
 */

  

#include <sound/driver.h>



#ifdef CONFIG_SND_PCM_OSS_PLUGINS



#include <linux/time.h>

#include <sound/core.h>

#include <sound/pcm.h>
@@ -135,5 +132,3 @@ int snd_pcm_plugin_build_io(struct snd_pcm_substream *plug, 
	*r_plugin = plugin;

	return 0;

}
 


#endif

sound/core/oss/linear.c

+0 −5
Original line number Diff line number Diff line
@@ -21,9 +21,6 @@ 
 */



#include <sound/driver.h>



#ifdef CONFIG_SND_PCM_OSS_PLUGINS



#include <linux/time.h>

#include <sound/core.h>

#include <sound/pcm.h>
@@ -159,5 +156,3 @@ int snd_pcm_plugin_build_linear(struct snd_pcm_substream *plug, 
	*r_plugin = plugin;

	return 0;

}
 


#endif

sound/core/oss/mulaw.c

+0 −5
Original line number Diff line number Diff line
@@ -22,9 +22,6 @@ 
 */

  

#include <sound/driver.h>



#ifdef CONFIG_SND_PCM_OSS_PLUGINS



#include <linux/time.h>

#include <sound/core.h>

#include <sound/pcm.h>
@@ -328,5 +325,3 @@ int snd_pcm_plugin_build_mulaw(struct snd_pcm_substream *plug, 
	*r_plugin = plugin;

	return 0;

}
 


#endif