aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-01-08 12:13:27 -0500
committerJaroslav Kysela <perex@perex.cz>2008-01-31 11:29:48 -0500
commit9004acc70e8c49c50c4c7b652f906f1e0ed5709d (patch)
treede504d87cc727b4ecab5718522ce94890f349149 /drivers/media/video/saa7134
parent31e8960b35975ed235d283d6fb95d0e28dffded0 (diff)
[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: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'drivers/media/video/saa7134')
-rw-r--r--drivers/media/video/saa7134/saa7134-alsa.c1
-rw-r--r--drivers/media/video/saa7134/saa7134.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index ba2531034a91..047add8f3010 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -21,7 +21,6 @@
21#include <linux/time.h> 21#include <linux/time.h>
22#include <linux/wait.h> 22#include <linux/wait.h>
23#include <linux/module.h> 23#include <linux/module.h>
24#include <sound/driver.h>
25#include <sound/core.h> 24#include <sound/core.h>
26#include <sound/control.h> 25#include <sound/control.h>
27#include <sound/pcm.h> 26#include <sound/pcm.h>
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index ce450304fb53..b88ca995fafb 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -38,7 +38,6 @@
38#include <media/ir-common.h> 38#include <media/ir-common.h>
39#include <media/ir-kbd-i2c.h> 39#include <media/ir-kbd-i2c.h>
40#include <media/videobuf-dma-sg.h> 40#include <media/videobuf-dma-sg.h>
41#include <sound/driver.h>
42#include <sound/core.h> 41#include <sound/core.h>
43#include <sound/pcm.h> 42#include <sound/pcm.h>
44#if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE) 43#if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE)