aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-01-31 06:10:49 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:42:35 -0400
commit74d200f13156f7057ed62ecca086be75cdf363d5 (patch)
tree9427dadf70b9e2a2b84390afd386d8e093c02e65 /drivers
parentaaf50d7d0e12ec797dc0677c4fc853839bdcf07d (diff)
V4L/DVB (10404): saa7134-core: remove oss option, since saa7134-oss doesn't exist anymore
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/saa7134/saa7134-core.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 829006ebdf34..ea48bb5b4af0 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -58,10 +58,6 @@ static unsigned int alsa;
58module_param(alsa, int, 0644); 58module_param(alsa, int, 0644);
59MODULE_PARM_DESC(alsa,"enable ALSA DMA sound [dmasound]"); 59MODULE_PARM_DESC(alsa,"enable ALSA DMA sound [dmasound]");
60 60
61static unsigned int oss;
62module_param(oss, int, 0644);
63MODULE_PARM_DESC(oss,"enable OSS DMA sound [dmasound]");
64
65static unsigned int latency = UNSET; 61static unsigned int latency = UNSET;
66module_param(latency, int, 0444); 62module_param(latency, int, 0444);
67MODULE_PARM_DESC(latency,"pci latency timer"); 63MODULE_PARM_DESC(latency,"pci latency timer");
@@ -158,8 +154,6 @@ static void request_module_async(struct work_struct *work){
158 request_module("saa7134-dvb"); 154 request_module("saa7134-dvb");
159 if (alsa) 155 if (alsa)
160 request_module("saa7134-alsa"); 156 request_module("saa7134-alsa");
161 if (oss)
162 request_module("saa7134-oss");
163} 157}
164 158
165static void request_submodules(struct saa7134_dev *dev) 159static void request_submodules(struct saa7134_dev *dev)