X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fradio%2Fmiropcm20-radio.c;fp=drivers%2Fmedia%2Fradio%2Fmiropcm20-radio.c;h=dc292da2605ffb4204dfcfb7c24b1ffc23256c42;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=c4312fa0e2f5278d071ef5eea2fe12ae82bf970a;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/media/radio/miropcm20-radio.c b/drivers/media/radio/miropcm20-radio.c
index c4312fa0e..dc292da26 100644
--- a/drivers/media/radio/miropcm20-radio.c
+++ b/drivers/media/radio/miropcm20-radio.c
@@ -16,14 +16,13 @@
 
 /* What ever you think about the ACI, version 0x07 is not very well!
  * I can't get frequency, 'tuner status', 'tuner flags' or mute/mono
- * conditions...                Robert
+ * conditions...                Robert 
  */
 
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/videodev.h>
-#include <media/v4l2-common.h>
-#include "oss/aci.h"
+#include "../../../sound/oss/aci.h"
 #include "miropcm20-rds-core.h"
 
 static int radio_nr = -1;
@@ -124,7 +123,7 @@ static int pcm20_do_ioctl(struct inode *inode, struct file *file,
 	struct video_device *dev = video_devdata(file);
 	struct pcm20_device *pcm20 = dev->priv;
 	int i;
-
+	
 	switch(cmd)
 	{
 		case VIDIOCGCAP:
@@ -140,7 +139,7 @@ static int pcm20_do_ioctl(struct inode *inode, struct file *file,
 		case VIDIOCGTUNER:
 		{
 			struct video_tuner *v = arg;
-			if(v->tuner)	/* Only 1 tuner */
+			if(v->tuner)	/* Only 1 tuner */ 
 				return -EINVAL;
 			v->rangelow=87*16000;
 			v->rangehigh=108*16000;
@@ -173,7 +172,7 @@ static int pcm20_do_ioctl(struct inode *inode, struct file *file,
 			return i;
 		}
 		case VIDIOCGAUDIO:
-		{
+		{	
 			struct video_audio *v = arg;
 			memset(v,0, sizeof(*v));
 			v->flags=VIDEO_AUDIO_MUTABLE;
@@ -184,12 +183,12 @@ static int pcm20_do_ioctl(struct inode *inode, struct file *file,
 				v->mode|=VIDEO_SOUND_MONO;
 			/* v->step=2048; */
 			strcpy(v->name, "Radio");
-			return 0;
+			return 0;			
 		}
 		case VIDIOCSAUDIO:
 		{
 			struct video_audio *v = arg;
-			if(v->audio)
+			if(v->audio) 
 				return -EINVAL;
 
 			pcm20_mute(pcm20, !!(v->flags&VIDEO_AUDIO_MUTE));
@@ -238,7 +237,7 @@ static int __init pcm20_init(void)
 {
 	if(video_register_device(&pcm20_radio, VFL_TYPE_RADIO, radio_nr)==-1)
 		goto video_register_device;
-
+		
 	if(attach_aci_rds()<0)
 		goto attach_aci_rds;