[PATCH] 2.6.6-mm4 compile fix.

[Muthukumar Ratty]

Andrew,
Compilation fails for me at drivers/media/radio/radio-cadet.c. Its because
of the readq change introduced in -mm4. Patch attached.

thanks,
Muthu.



--- drivers/media/radio/radio-cadet.c	2004-05-19 16:30:25.672467232 -0700
+++ drivers/media/radio/radio-cadet.c.readq	2004-05-19 16:30:01.444150496 -0700
@@ -45,7 +45,7 @@ static int users=0;
 static int curtuner=0;
 static int tunestat=0;
 static int sigstrength=0;
-static wait_queue_head_t radio_readq;
+static wait_queue_head_t readq;
 struct timer_list tunertimer,rdstimer,readtimer;
 static __u8 rdsin=0,rdsout=0,rdsstat=0;
 static unsigned char rdsbuf[RDS_BUFFER];
@@ -309,7 +309,7 @@ void cadet_handler(unsigned long data)
 	 * Service pending read
 	 */
 	if( rdsin!=rdsout)
-	        wake_up_interruptible(&radio_readq);
+	        wake_up_interruptible(&readq);

 	/*
 	 * Clean up and exit
@@ -343,7 +343,7 @@ static ssize_t cadet_read(struct file *f
 	if(rdsin==rdsout) {
   	        if (file->f_flags & O_NONBLOCK)
 		        return -EWOULDBLOCK;
-	        interruptible_sleep_on(&radio_readq);
+	        interruptible_sleep_on(&readq);
 	}
 	while( i<count && rdsin!=rdsout)
 	        readbuf[i++]=rdsbuf[rdsout++];
@@ -473,7 +473,7 @@ static int cadet_open(struct inode *inod
 	if(users)
 		return -EBUSY;
 	users++;
-	init_waitqueue_head(&radio_readq);
+	init_waitqueue_head(&readq);
 	return 0;
 }



-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/