mtd/drivers/mtd mtdblock-24.c,1.1,1.2

[David Woodhouse]

Update of /home/cvs/mtd/drivers/mtd
In directory phoenix.infradead.org:/tmp/cvs-serv25647

Modified Files:
	mtdblock-24.c 
Log Message:
Remove 2.5-specific code from 2.4-specific file :)


Index: mtdblock-24.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/mtdblock-24.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mtdblock-24.c	27 Nov 2002 10:32:27 -0000	1.1
+++ mtdblock-24.c	24 Jan 2003 15:58:49 -0000	1.2
@@ -38,8 +38,6 @@
 static struct mtdblk_dev *mtdblks[MAX_MTD_DEVICES];
 
 static spinlock_t mtdblks_lock;
-/* this lock is used just in kernels >= 2.5.x */ 
-static spinlock_t mtdblock_lock;
 
 static int mtd_sizes[MAX_MTD_DEVICES];
 static int mtd_blksizes[MAX_MTD_DEVICES];
@@ -389,8 +387,6 @@
 	int i;
 
 	spin_lock_init(&mtdblks_lock);
-	/* this lock is used just in kernels >= 2.5.x */
-	spin_lock_init(&mtdblock_lock);
 
 #ifdef CONFIG_DEVFS_FS
 	if (devfs_register_blkdev(MTD_BLOCK_MAJOR, DEVICE_NAME, &mtd_fops))
@@ -420,7 +416,7 @@
 	blksize_size[MAJOR_NR] = mtd_blksizes;
 	blk_size[MAJOR_NR] = mtd_sizes;
 
-	BLK_INIT_QUEUE(BLK_DEFAULT_QUEUE(MAJOR_NR), &mtdblock_request, &mtdblock_lock);
+	blk_init_queue(BLK_DEFAULT_QUEUE(MAJOR_NR), &mtdblock_request);
 		    
 	kernel_thread (mtdblock_thread, NULL, CLONE_FS|CLONE_FILES|CLONE_SIGHAND);
 	return 0;