diff -Nur /mounts/array0/tmp/linux/drivers/char/msp3400.c linux/drivers/char/msp3400.c
--- /mounts/array0/tmp/linux/drivers/char/msp3400.c	Wed Jun 21 02:32:13 2000
+++ linux/drivers/char/msp3400.c	Sat Jul  1 11:45:58 2000
@@ -85,7 +85,6 @@
 			      the autoscan seems work well only with FM... */
 static int simple  = -1;   /* use short programming (>= msp3410 only) */
 static int dolby   = 0;
-static int mixer   = -1;
 
 struct msp3400c {
 	int simple;
diff -Nur /mounts/array0/tmp/linux/drivers/ide/piix.c linux/drivers/ide/piix.c
--- /mounts/array0/tmp/linux/drivers/ide/piix.c	Wed Jun 21 02:52:36 2000
+++ linux/drivers/ide/piix.c	Sat Jul  1 11:21:46 2000
@@ -191,6 +191,7 @@
 
 extern char *ide_xfer_verbose (byte xfer_rate);
 
+#if defined(CONFIG_BLK_DEV_IDEDMA) && defined(CONFIG_PIIX_TUNING)
 /*
  *
  */
@@ -221,6 +222,7 @@
 			return 0;
 	}
 }
+#endif
 
 /*
  *  Based on settings done by AMI BIOS
diff -Nur /mounts/array0/tmp/linux/fs/nfsd/nfsctl.c linux/fs/nfsd/nfsctl.c
--- /mounts/array0/tmp/linux/fs/nfsd/nfsctl.c	Tue Jul  4 08:56:42 2000
+++ linux/fs/nfsd/nfsctl.c	Mon Jul  3 20:43:53 2000
@@ -321,7 +321,7 @@
 init_module(void)
 {
 	printk(KERN_INFO "Installing knfsd (copyright (C) 1996 okir@monad.swb.de).\n");
-	do_nfsservctl = handle_sys_nfsservctl;
+	do_nfsservctl = (int(*)(int,void*,void*))handle_sys_nfsservctl;
 	return 0;
 }
 
diff -Nur /mounts/array0/tmp/linux/include/linux/init.h linux/include/linux/init.h
--- /mounts/array0/tmp/linux/include/linux/init.h	Sat Jun 24 16:30:21 2000
+++ linux/include/linux/init.h	Sat Jul  1 11:33:36 2000
@@ -98,8 +98,21 @@
 
 /* Not sure what version aliases were introduced in, but certainly in 2.91.66.  */
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 91)
-#define module_init(x)	int init_module(void) __attribute__((alias(#x)));
-#define module_exit(x)	void cleanup_module(void) __attribute__((alias(#x)));
+/* These macros create a dummy inline: gcc 2.9x does not count alias
+ as usage, hence the `unused function' warning when __init functions
+ are declared static. We use the dummy __*_module_inline functions
+ both to kill the warning and check the type of the init/cleanup
+ function. */
+typedef int (*__init_module_func_t)(void);
+typedef void (*__cleanup_module_func_t)(void);
+#define module_init(x) \
+	int init_module(void) __attribute__((alias(#x))); \
+	extern inline __init_module_func_t __init_module_inline(void) \
+	{ return x; }
+#define module_exit(x) \
+	void cleanup_module(void) __attribute__((alias(#x))); \
+	extern inline __cleanup_module_func_t __cleanup_module_inline(void) \
+	{ return x; }
 #else
 #define module_init(x)	int init_module(void) { return x(); }
 #define module_exit(x)	void cleanup_module(void) { x(); }
diff -Nur /mounts/array0/tmp/linux/net/ipx/af_ipx.c linux/net/ipx/af_ipx.c
--- /mounts/array0/tmp/linux/net/ipx/af_ipx.c	Tue Jun 20 08:45:51 2000
+++ linux/net/ipx/af_ipx.c	Mon Jul  3 20:52:54 2000
@@ -1581,7 +1581,7 @@
 				       htons(s->protinfo.af_ipx.port));
 #else
 			len += sprintf(buffer+len,"%08lX:%04X  ",
-				       htonl(i->if_netnum),
+				       (long unsigned int) htonl(i->if_netnum),
 				       htons(s->protinfo.af_ipx.port));
 #endif	/* CONFIG_IPX_INTERN */