summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-02-05 10:29:31 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-02-05 10:29:31 -0200
commit56eb8c85473f48c34f74e3591b956e3c63957262 (patch)
tree895f8f58a34a6b494b6ea6dcb398ca475118589b
parent7d0a27c6756421a80ed6a0936aec0b74c0e57389 (diff)
downloadmediapointer-dvb-s2-56eb8c85473f48c34f74e3591b956e3c63957262.tar.gz
mediapointer-dvb-s2-56eb8c85473f48c34f74e3591b956e3c63957262.tar.bz2
backport kernel commit 9004acc70e8c49c50c4c7b652f906f1e0ed5709d
From: Mauro Carvalho Chehab <mchehab@infradead.org> Original patch comments: Author: Takashi Iwai <tiwai@suse.de> Date: Tue Jan 8 18:13:27 2008 +0100 [ALSA] Remove sound/driver.h This header file exists only for some hacks to adapt alsa-driver tree. It's useless for building in the kernel. Let's move a few lines in it to sound/core.h and remove it. With this patch, sound/driver.h isn't removed but has just a single compile warning to include it. This should be really killed in future. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--linux/drivers/media/video/cx88/cx88-alsa.c1
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-alsa.c1
-rw-r--r--linux/drivers/media/video/saa7134/saa7134.h1
-rw-r--r--linux/sound/i2c/other/tea575x-tuner.c1
-rw-r--r--linux/sound/pci/bt87x.c1
5 files changed, 0 insertions, 5 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-alsa.c b/linux/drivers/media/video/cx88/cx88-alsa.c
index f5d65f675..ae69ba065 100644
--- a/linux/drivers/media/video/cx88/cx88-alsa.c
+++ b/linux/drivers/media/video/cx88/cx88-alsa.c
@@ -33,7 +33,6 @@
#include <linux/pci.h>
#include <asm/delay.h>
-#include <sound/driver.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
diff --git a/linux/drivers/media/video/saa7134/saa7134-alsa.c b/linux/drivers/media/video/saa7134/saa7134-alsa.c
index 49ff12d08..d9660becc 100644
--- a/linux/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/linux/drivers/media/video/saa7134/saa7134-alsa.c
@@ -22,7 +22,6 @@
#include <linux/time.h>
#include <linux/wait.h>
#include <linux/module.h>
-#include <sound/driver.h>
#include <sound/core.h>
#include <sound/control.h>
#include <sound/pcm.h>
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index 29d71cbac..b7464c706 100644
--- a/linux/drivers/media/video/saa7134/saa7134.h
+++ b/linux/drivers/media/video/saa7134/saa7134.h
@@ -44,7 +44,6 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,64)
#include "i2c-compat.h"
#else
-#include <sound/driver.h>
#include <sound/core.h>
#include <sound/pcm.h>
#endif
diff --git a/linux/sound/i2c/other/tea575x-tuner.c b/linux/sound/i2c/other/tea575x-tuner.c
index 52d190597..4c100300c 100644
--- a/linux/sound/i2c/other/tea575x-tuner.c
+++ b/linux/sound/i2c/other/tea575x-tuner.c
@@ -20,7 +20,6 @@
*
*/
-#include <sound/driver.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c
index 86c922635..3e820f75c 100644
--- a/linux/sound/pci/bt87x.c
+++ b/linux/sound/pci/bt87x.c
@@ -21,7 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <sound/driver.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/pci.h>