diff -urN RC13-git7-m68k-8390/drivers/sbus/char/bbc_envctrl.c RC13-git7-envctrl/drivers/sbus/char/bbc_envctrl.c
--- RC13-git7-m68k-8390/drivers/sbus/char/bbc_envctrl.c	2005-08-28 23:09:45.000000000 -0400
+++ RC13-git7-envctrl/drivers/sbus/char/bbc_envctrl.c	2005-09-07 13:55:16.000000000 -0400
@@ -5,6 +5,7 @@
  */
 
 #define __KERNEL_SYSCALLS__
+static int errno;
 
 #include <linux/kernel.h>
 #include <linux/kthread.h>
@@ -13,8 +14,6 @@
 #include <linux/delay.h>
 #include <asm/oplib.h>
 #include <asm/ebus.h>
-static int errno;
-#include <asm/unistd.h>
 
 #include "bbc_i2c.h"
 #include "max1617.h"
diff -urN RC13-git7-m68k-8390/drivers/sbus/char/envctrl.c RC13-git7-envctrl/drivers/sbus/char/envctrl.c
--- RC13-git7-m68k-8390/drivers/sbus/char/envctrl.c	2005-08-28 23:09:45.000000000 -0400
+++ RC13-git7-envctrl/drivers/sbus/char/envctrl.c	2005-09-07 13:55:16.000000000 -0400
@@ -20,6 +20,7 @@
  */
 
 #define __KERNEL_SYSCALLS__
+static int errno;
 
 #include <linux/config.h>
 #include <linux/module.h>
@@ -38,9 +39,6 @@
 #include <asm/uaccess.h>
 #include <asm/envctrl.h>
 
-static int errno;
-#include <asm/unistd.h>
-
 #define ENVCTRL_MINOR	162
 
 #define PCF8584_ADDRESS	0x55