diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/i2c/i2c-core.c linux-2.5/drivers/i2c/i2c-core.c
--- bk-linus/drivers/i2c/i2c-core.c	2002-11-21 02:14:27.000000000 +0000
+++ linux-2.5/drivers/i2c/i2c-core.c	2002-11-21 17:58:07.000000000 +0000
@@ -622,7 +622,8 @@ ssize_t i2cproc_bus_read(struct file * f
 	struct inode * inode = file->f_dentry->d_inode;
 	char *kbuf;
 	struct i2c_client *client;
-	int i,j,k,order_nr,len=0,len_total;
+	int i,j,k,order_nr,len=0;
+	size_t len_total;
 	int order[I2C_CLIENT_MAX];
 #define OUTPUT_LENGTH_PER_LINE 70
 
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/char/nvram.c linux-2.5/drivers/char/nvram.c
--- bk-linus/drivers/char/nvram.c	2002-11-21 02:13:55.000000000 +0000
+++ linux-2.5/drivers/char/nvram.c	2002-11-21 17:57:42.000000000 +0000
@@ -231,8 +231,7 @@ nvram_set_checksum(void)
  * The are the file operation function for user access to /dev/nvram
  */
 
-static long long
-nvram_llseek(struct file *file, loff_t offset, int origin)
+static loff_t nvram_llseek(struct file *file,loff_t offset, int origin )
 {
 	lock_kernel();
 	switch (origin) {
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/net/sk98lin/skge.c linux-2.5/drivers/net/sk98lin/skge.c
--- bk-linus/drivers/net/sk98lin/skge.c	2002-11-21 02:16:54.000000000 +0000
+++ linux-2.5/drivers/net/sk98lin/skge.c	2002-11-21 17:59:46.000000000 +0000
@@ -442,7 +442,7 @@ static int __init skge_probe (void)
 		    pci_set_dma_mask(pdev, (u64) 0xffffffff))
 				continue;
 
-		if ((dev = init_etherdev(dev, sizeof(DEV_NET))) == 0) {
+		if ((dev = init_etherdev(dev, sizeof(DEV_NET))) == NULL) {
 			printk(KERN_ERR "Unable to allocate etherdev "
 			       "structure!\n");
 			break;
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/sound/oss/mpu401.h linux-2.5/sound/oss/mpu401.h
--- bk-linus/sound/oss/mpu401.h	2002-11-21 02:26:07.000000000 +0000
+++ linux-2.5/sound/oss/mpu401.h	2002-11-21 18:06:20.000000000 +0000
@@ -7,7 +7,7 @@ void uart401intr (int irq, void *dev_id,
 
 /*	From mpu401.c */
 int probe_mpu401(struct address_info *hw_config);
-void attach_mpu401(struct address_info * hw_config, struct module *owner);
+int attach_mpu401(struct address_info * hw_config, struct module *owner);
 void unload_mpu401(struct address_info *hw_info);
 
 int intchk_mpu401(void *dev_id);
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/char/nwflash.c linux-2.5/drivers/char/nwflash.c
--- bk-linus/drivers/char/nwflash.c	2002-11-21 02:13:56.000000000 +0000
+++ linux-2.5/drivers/char/nwflash.c	2002-11-21 17:57:42.000000000 +0000
@@ -47,7 +47,7 @@ static int write_block(unsigned long p, 
 static int flash_ioctl(struct inode *inodep, struct file *filep, unsigned int cmd, unsigned long arg);
 static ssize_t flash_read(struct file *file, char *buf, size_t count, loff_t * ppos);
 static ssize_t flash_write(struct file *file, const char *buf, size_t count, loff_t * ppos);
-static long long flash_llseek(struct file *file, long long offset, int orig);
+static loff_t flash_llseek(struct file *file, loff_t offset, int orig);
 
 #define KFLASH_SIZE	1024*1024	//1 Meg
 #define KFLASH_SIZE4	4*1024*1024	//4 Meg
@@ -301,9 +301,9 @@ static ssize_t flash_write(struct file *
  * also note that seeking relative to the "end of file" isn't supported:
  * it has no meaning, so it returns -EINVAL.
  */
-static long long flash_llseek(struct file *file, long long offset, int orig)
+static loff_t flash_llseek(struct file *file, loff_t offset, int orig)
 {
-	long long ret;
+	loff_t ret;
 
 	lock_kernel();
 	if (flashdebug)