diff options
| author | viro@ZenIV.linux.org.uk <viro@ZenIV.linux.org.uk> | 2005-09-09 23:09:08 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 19:16:27 +0200 |
| commit | 0aaaa028297a0e2aed9671419a11d8e17510cb51 (patch) | |
| tree | 0588fcac9a57c14a244d5efe32211d25e903b864 /drivers/sbus | |
| parent | [PATCH] __user annotations (scsi/ch) (diff) | |
| download | linux-0aaaa028297a0e2aed9671419a11d8e17510cb51.tar.xz linux-0aaaa028297a0e2aed9671419a11d8e17510cb51.zip | |
[PATCH] envctrl fixes
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>
Diffstat (limited to 'drivers/sbus')
| -rw-r--r-- | drivers/sbus/char/bbc_envctrl.c | 3 | ||||
| -rw-r--r-- | drivers/sbus/char/envctrl.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c index d44205d52bf3..d89f83f769f5 100644 --- a/drivers/sbus/char/bbc_envctrl.c +++ b/drivers/sbus/char/bbc_envctrl.c @@ -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 --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c index d765cc1bf060..b0cc3c2588fd 100644 --- a/drivers/sbus/char/envctrl.c +++ b/drivers/sbus/char/envctrl.c @@ -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 |