patch-2.4.0-test12 linux/drivers/block/ataflop.c

• Lines: 18
• Date: Tue Dec 5 12:29:38 2000
• Orig file: v2.4.0-test11/linux/drivers/block/ataflop.c
• Orig date: Wed Jul 5 11:24:40 2000

diff -u --recursive --new-file v2.4.0-test11/linux/drivers/block/ataflop.c linux/drivers/block/ataflop.c
@@ -317,7 +317,7 @@
 static DECLARE_WAIT_QUEUE_HEAD(fdc_wait);
 static DECLARE_WAIT_QUEUE_HEAD(format_wait);
 
-static unsigned int changed_floppies = 0xff, fake_change = 0;
+static unsigned long changed_floppies = 0xff, fake_change = 0;
 #define	CHECK_CHANGE_DELAY	HZ/2
 
 #define	FD_MOTOR_OFF_DELAY	(3*HZ)
@@ -1990,7 +1990,7 @@
 	SelectedDrive = -1;
 	BufferDrive = -1;
 
-	DMABuffer = atari_stram_alloc( BUFFER_SIZE+512, NULL, "ataflop" );
+	DMABuffer = atari_stram_alloc(BUFFER_SIZE+512, "ataflop");
 	if (!DMABuffer) {
 		printk(KERN_ERR "atari_floppy_init: cannot get dma buffer\n");
 		unregister_blkdev(MAJOR_NR, "fd");