[PATCH] M68k update (part 11)

Fix miscellaneous compilation warnings and errors

arch/m68k/apollo/dn_ints.c

@@ -2,6 +2,7 @@
 #include <linux/kernel.h>
 #include <linux/jiffies.h>
 #include <linux/kernel_stat.h>
+#include <linux/timer.h>
 
 #include <asm/system.h>
 #include <asm/irq.h>
@@ -9,6 +10,7 @@
 #include <asm/page.h>
 #include <asm/machdep.h>
 #include <asm/apollohw.h>
+#include <asm/errno.h>
 
 static irq_handler_t dn_irqs[16];
 

arch/m68k/bvme6000/config.c

@@ -22,6 +22,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <linux/major.h>
+#include <linux/genhd.h>
 #include <linux/rtc.h>
 
 #include <asm/bootinfo.h>

arch/m68k/hp300/ints.c

@@ -22,6 +22,7 @@
 #include <asm/system.h>
 #include <asm/traps.h>
 #include <asm/ptrace.h>
+#include <asm/errno.h>
 #include "ints.h"
 
 /* Each ipl has a linked list of interrupt service routines.
@@ -142,7 +143,9 @@ void hp300_free_irq(unsigned int irq, void *dev_id)
         }
         /* remove the entry after t: */
         t->next->flags = IRQ_FLG_STD;
-        t->next->dev_id = t->next->devname = t->next->handler = NULL;
+        t->next->dev_id = NULL;
+	t->next->devname = NULL;
+	t->next->handler = NULL;
         t->next = t->next->next;
         
 	spin_unlock_irqrestore(&irqlist_lock, flags);

arch/m68k/mac/baboon.c

@@ -19,8 +19,8 @@
 #include <asm/macints.h> 
 #include <asm/mac_baboon.h>
 
-/* #define DEBUG_BABOON /**/
-/* #define DEBUG_IRQS /**/
+/* #define DEBUG_BABOON */
+/* #define DEBUG_IRQS */
 
 int baboon_present,baboon_active;
 volatile struct baboon *baboon;

arch/m68k/mac/macints.c

@@ -131,6 +131,7 @@
 #include <asm/mac_via.h>
 #include <asm/mac_psc.h>
 #include <asm/hwtest.h>
+#include <asm/errno.h>
 
 #include <asm/macints.h>
 

arch/m68k/mac/misc.c

@@ -229,8 +229,8 @@ static long via_read_time(void)
 	do {
 		if (++ct > 10) {
 			printk("via_read_time: couldn't get valid time, "
-			       "last read = 0x%08X and 0x%08X\n", last_result.idata,
-			       result.idata);
+			       "last read = 0x%08lx and 0x%08lx\n",
+			       last_result.idata, result.idata);
 			break;
 		}
 

arch/m68k/mvme147/config.c

@@ -21,6 +21,8 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <linux/major.h>
+#include <linux/genhd.h>
+#include <linux/rtc.h>
 
 #include <asm/bootinfo.h>
 #include <asm/system.h>

arch/m68k/mvme16x/config.c

@@ -22,6 +22,8 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <linux/major.h>
+#include <linux/genhd.h>
+#include <linux/rtc.h>
 
 #include <asm/bootinfo.h>
 #include <asm/system.h>

drivers/char/ser_a2232.c

@@ -90,6 +90,7 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
+#include <linux/tty.h>
 
 #include <asm/setup.h>
 #include <asm/amigaints.h>

drivers/char/serial167.c

@@ -62,6 +62,7 @@
 #include <linux/major.h>
 #include <linux/mm.h>
 #include <linux/console.h>
+#include <linux/module.h>
 
 #include <asm/system.h>
 #include <asm/io.h>

drivers/ide/q40ide.c

@@ -79,8 +79,8 @@ void q40ide_init(void)
     for (i = 0; i < Q40IDE_NUM_HWIFS; i++) {
 	hw_regs_t hw;
 
-	ide_setup_ports(&hw,(ide_ioreg_t) pcide_bases[i], (int *)pcide_offsets,
-			pcide_bases[i] + 0x206,
+	ide_setup_ports(&hw, (ide_ioreg_t)pcide_bases[i], (int *)pcide_offsets,
+			(ide_ioreg_t)pcide_bases[i]+0x206,
 			0, NULL, q40ide_default_irq(pcide_bases[i]));
 	ide_register_hw(&hw);
     }

drivers/macintosh/adb.c

@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/completion.h>
+#include <linux/tqueue.h>
 #include <asm/uaccess.h>
 #ifdef CONFIG_PPC
 #include <asm/prom.h>

drivers/net/7990.c

@@ -569,7 +569,7 @@ static void lance_load_multicast (struct net_device *dev)
         volatile u16 *mcast_table = (u16 *)&ib->filter;
         struct dev_mc_list *dmi=dev->mc_list;
         char *addrs;
-        int i, j, bit, byte;
+        int i;
         u32 crc;
         
         /* set all multicast bits */

drivers/net/a2065.c

@@ -639,7 +639,7 @@ static void lance_load_multicast (struct net_device *dev)
 	volatile u16 *mcast_table = (u16 *)&ib->filter;
 	struct dev_mc_list *dmi=dev->mc_list;
 	char *addrs;
-	int i, j, bit, byte;
+	int i;
 	u32 crc;
 	
 	/* set all multicast bits */

drivers/net/atarilance.c

@@ -565,7 +565,7 @@ static unsigned long __init lance_probe1( struct net_device *dev,
 		}
 		if (request_irq(irq, lance_interrupt, IRQ_TYPE_PRIO,
 		            "Riebl-VME Ethernet", dev)) {
-			printk( "Lance: request for irq %d failed\n", irq );
+			printk( "Lance: request for irq %ld failed\n", irq );
 			return( 0 );
 		}
 		dev->irq = irq;
@@ -926,7 +926,7 @@ static void lance_interrupt( int irq, void *dev_id, struct pt_regs *fp)
 #ifndef final_version
 			if (lp->cur_tx - dirty_tx >= TX_RING_SIZE) {
 				DPRINTK( 0, ( "out-of-sync dirty pointer,"
-							  " %d vs. %d, full=%d.\n",
+							  " %d vs. %d, full=%ld.\n",
 							  dirty_tx, lp->cur_tx, lp->tx_full ));
 				dirty_tx += TX_RING_SIZE;
 			}

drivers/scsi/atari_scsi.h

@@ -258,8 +258,6 @@ int atari_scsi_release (struct Scsi_Host *);
 #define NCR_PRINT_STATUS(mask) \
 	((NDEBUG & (mask)) ? NCR5380_print_status(instance) : (void)0)
 
-#define NDEBUG_ANY	0xffffffff
-
 
 #endif /* ndef ASM */
 #endif /* ATARI_SCSI_H */

drivers/video/fm2fb.c

@@ -198,8 +198,9 @@ static int fm2fb_blank(int blank, struct fb_info *info)
 	if (!blank)
 		t |= FRAMEMASTER_ENABLE | FRAMEMASTER_NOLACE;
 	fm2fb_reg[0] = t;
+	return 0;
 }
-    
+
     /*
      *  Set a single color register. The values supplied are already
      *  rounded down to the hardware's capabilities (according to the

drivers/video/hpfb.c

@@ -49,6 +49,7 @@ static struct fb_fix_screeninfo hpfb_fix __initdata = {
 	visual:		FB_VISUAL_PSEUDOCOLOR,
 	line_length:	1024,
 	accel:		FB_ACCEL_NONE,
+};
 
 static struct fb_var_screeninfo hpfb_defined = {
 	xres:		1024,
@@ -163,7 +164,7 @@ int __init hpfb_init_one(unsigned long base)
 	fb_info.flags = FBINFO_FLAG_DEFAULT;
 	fb_info.var   = hpfb_defined;
 	fb_info.fix   = hpfb_fix;
-	fb_info.screen_base = hpfb_fix.smem_start;
+	fb_info.screen_base = (char *)hpfb_fix.smem_start;	// FIXME
 
 	/* The below feilds will go away !!!! */
 	fb_info.currcon		= -1;

drivers/video/q40fb.c

@@ -42,7 +42,7 @@ static struct fb_fix_screeninfo q40fb_fix __initdata = {
 	type:		FB_TYPE_PACKED_PIXELS,
 	visual:		FB_VISUAL_TRUECOLOR,
 	line_length:	1024*2,
-	accel_flags:	FB_ACCEL_NONE,
+	accel:		FB_ACCEL_NONE,
 };
 
 static struct fb_var_screeninfo q40fb_var __initdata = {
@@ -95,9 +95,9 @@ static int q40fb_setcolreg(unsigned regno, unsigned red, unsigned green,
     blue>>=10;
 
     if (regno < 16) {
-	info->pseudo_palette[regno] = ((red & 31) <<6) |
-	                              ((green & 31) << 11) |
-	                         	(blue & 63);
+	((u16 *)info->pseudo_palette)[regno] = ((red & 31) <<6) |
+					       ((green & 31) << 11) |
+					       (blue & 63);
     }
     return 0;
 }

drivers/video/retz3fb.c

@@ -1274,8 +1274,6 @@ static int retz3fb_set_var(struct fb_var_screeninfo *var, int con,
 static int retz3fb_get_cmap(struct fb_cmap *cmap, int kspc, int con,
 			    struct fb_info *info)
 {
-	struct retz3_fb_info *zinfo = retz3info(info);
-
 	if (con == info->currcon) /* current console? */
 		return(fb_get_cmap(cmap, kspc, retz3_getcolreg, info));
 	else if (fb_display[con].cmap.len) /* non default colormap? */
@@ -1446,8 +1444,6 @@ int __init retz3fb_init(void)
 
 static int z3fb_switch(int con, struct fb_info *info)
 {
-	struct retz3_fb_info *zinfo = retz3info(info);
-
 	/* Do we have to save the colormap? */
 	if (fb_display[info->currcon].cmap.len)
 		fb_get_cmap(&fb_display[info->currcon].cmap, 1,

drivers/video/vfb.c

@@ -24,7 +24,7 @@
 #include <linux/fb.h>
 #include <linux/init.h>
 
-#include <linux/fbcon.h>
+#include <video/fbcon.h>
 
     /*
      *  RAM we reserve for the frame buffer. This defines the maximum screen
@@ -446,7 +446,7 @@ int __init vfb_init(void)
 	fb_info.pseudo_palette = &vfb_pseudo_palette;
 	fb_info.flags = FBINFO_FLAG_DEFAULT;
 
-	strcpy(fb_info.modename, vesafb_fix.id);
+	strcpy(fb_info.modename, vfb_fix.id);
 	fb_info.changevar = NULL;
 	fb_info.currcon = -1;
 	fb_info.disp = &disp;

include/asm-m68k/apollodma.h

@@ -9,7 +9,7 @@
 #define _ASM_APOLLO_DMA_H
 
 #include <asm/apollohw.h>		/* need byte IO */
-#include <asm/spinlock.h>	/* And spinlocks */
+#include <linux/spinlock.h>		/* And spinlocks */
 #include <linux/delay.h>
 
 

include/asm-m68k/atarihw.h

@@ -133,7 +133,7 @@ extern struct atari_hw_present atari_hw_present;
 
 
 #include <linux/mm.h>
-#include <asm/pgalloc.h>
+#include <asm/cacheflush.h>
 
 static inline void dma_cache_maintenance( unsigned long paddr,
 					  unsigned long len,

include/asm-m68k/bitops.h

@@ -8,6 +8,8 @@
  * for more details.
  */
 
+#include <linux/compiler.h>
+
 /*
  * Require 68020 or better.
  *

include/asm-m68k/hw_irq.h

+#ifndef __ASM_M68K_HW_IRQ_H
+#define __ASM_M68K_HW_IRQ_H
+
+/* Dummy include. */
+
+#endif

include/asm-m68k/irq.h

@@ -73,6 +73,8 @@ extern void (*disable_irq)(unsigned int);
 #define disable_irq_nosync	disable_irq
 #define enable_irq_nosync	enable_irq
 
+struct pt_regs;
+
 extern int sys_request_irq(unsigned int, 
 	void (*)(int, void *, struct pt_regs *), 
 	unsigned long, const char *, void *);

include/asm-m68k/macintosh.h

@@ -39,9 +39,6 @@ extern void print_booter(char *ptr);
  *	Macintosh Table
  */
  
-struct mac_model *macintosh_config;
-
-
 struct mac_model
 {
 	short ident;

include/asm-m68k/semaphore-helper.h

@@ -10,6 +10,7 @@
  */
 
 #include <linux/config.h>
+#include <linux/errno.h>
 
 /*
  * These two _must_ execute atomically wrt each other.

include/asm-m68k/suspend.h

+#ifndef _M68K_SUSPEND_H
+#define _M68K_SUSPEND_H
+
+/* Dummy include. */
+
+#endif  /* _M68K_SUSPEND_H */

include/linux/intermezzo_fs.h

@@ -19,6 +19,7 @@
 #ifdef __KERNEL__
 #include <linux/smp.h>
 #include <linux/fsfilter.h>
+#include <linux/namei.h>
 
 /* fixups for fs.h */
 #ifndef fs_down