From 887f9f0253ba4a52f38810f3056cdf040a6157b3 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 8 Aug 2007 15:20:48 +0200
Subject: [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: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
---
 sound/core/oss/rate.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'sound/core/oss/rate.c')

diff --git a/sound/core/oss/rate.c b/sound/core/oss/rate.c
index 18d8a0f4e816..66f1dbe492cf 100644
--- a/sound/core/oss/rate.c
+++ b/sound/core/oss/rate.c
@@ -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>
@@ -340,5 +337,3 @@ int snd_pcm_plugin_build_rate(struct snd_pcm_substream *plug,
 	*r_plugin = plugin;
 	return 0;
 }
-
-#endif
-- 
cgit 


From c1017a4cdb68ae5368fbc9ee42c77f1f5dca8916 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 15 Oct 2007 09:50:19 +0200
Subject: [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to
 perex@perex.cz

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 sound/core/oss/rate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sound/core/oss/rate.c')

diff --git a/sound/core/oss/rate.c b/sound/core/oss/rate.c
index 66f1dbe492cf..9eb267913c38 100644
--- a/sound/core/oss/rate.c
+++ b/sound/core/oss/rate.c
@@ -1,6 +1,6 @@
 /*
  *  Rate conversion Plug-In
- *  Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This library is free software; you can redistribute it and/or modify
-- 
cgit