Subject: L68K: Re: [2.1.33] doesn't compile...
To: linux-m68k@phil.uni-sb.de
Date: Mon, 14 Apr 1997 19:36:40 +0200 (MET DST)
From: Torsten Scherer <itschere@TechFak.Uni-Bielefeld.DE>
Sender: owner-linux-m68k@phil.uni-sb.de
Reply-To: linux-m68k@phil.uni-sb.de

I wrote:

> PS: there've been other minor problems too, but at this point I gave up

 Ok, I've been disappointed, but I could at least have send the minor
patches. Here they are:

ciao,
TeSche

diff -ur linux-2.1.33-m68k/arch/m68k/atari/atafb.c linux-2.1.33-m68k-tesche/arch/m68k/atari/atafb.c
--- linux-2.1.33-m68k/arch/m68k/atari/atafb.c	Sat Apr  5 12:38:04 1997
+++ linux-2.1.33-m68k-tesche/arch/m68k/atari/atafb.c	Mon Apr 14 19:01:29 1997
@@ -2905,7 +2905,7 @@
		do_install_cmap(currcon);
 }
 
-static void
+static int
 atafb_setcmap(struct fb_cmap *cmap, int con)
 {
	return(atari_fb_set_cmap(cmap, 1, con));
diff -ur linux-2.1.33-m68k/arch/m68k/atari/config.c linux-2.1.33-m68k-tesche/arch/m68k/atari/config.c
--- linux-2.1.33-m68k/arch/m68k/atari/config.c	Mon Apr 14 17:43:45 1997
+++ linux-2.1.33-m68k-tesche/arch/m68k/atari/config.c	Mon Apr 14 18:57:25 1997
@@ -933,7 +933,7 @@
 
 static void ata_scc_console_write (const char *str, unsigned int count)
 {
-    while (cout--) {
+    while (count--) {
	if (*str == '\n')
	    ata_scc_out( '\r' );
	ata_scc_out( *str++ );
diff -ur linux-2.1.33-m68k/drivers/block/ataflop.c linux-2.1.33-m68k-tesche/drivers/block/ataflop.c
--- linux-2.1.33-m68k/drivers/block/ataflop.c	Mon Apr 14 17:44:38 1997
+++ linux-2.1.33-m68k-tesche/drivers/block/ataflop.c	Mon Apr 14 18:35:19 1997
@@ -410,7 +410,7 @@
 static int fd_test_drive_present( int drive );
 static void config_types( void );
 static int floppy_open( struct inode *inode, struct file *filp );
-static void floppy_release( struct inode * inode, struct file * filp );
+static int floppy_release( struct inode * inode, struct file * filp );
 
 /************************* End of Prototypes **************************/