[PATCH] envctrl fixes
authorviro@ZenIV.linux.org.uk <viro@ZenIV.linux.org.uk>
Fri, 9 Sep 2005 21:09:08 +0000 (22:09 +0100)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 10 Sep 2005 17:16:27 +0000 (10:16 -0700)
envctrl doesn't need unistd.h; moreover, since it declares errno static
gcc4 gets very unhappy about including unistd.h.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/sbus/char/bbc_envctrl.c
drivers/sbus/char/envctrl.c

index d44205d52bf3ce7a69a0da0678c0fe0d377f10d9..d89f83f769f5426d36d3e5ec16a18afcffd61469 100644 (file)
@@ -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"
index d765cc1bf060bc30d17e1e3ba78d01429dedf457..b0cc3c2588fdd44074cf6ae873c920489b0a111f 100644 (file)
@@ -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