From 0aaaa028297a0e2aed9671419a11d8e17510cb51 Mon Sep 17 00:00:00 2001 From: "viro@ZenIV.linux.org.uk" Date: Fri, 9 Sep 2005 22:09:08 +0100 Subject: [PATCH] [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 Signed-off-by: Linus Torvalds --- drivers/sbus/char/bbc_envctrl.c | 3 +-- 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 #include @@ -13,8 +14,6 @@ #include #include #include -static int errno; -#include #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 #include @@ -38,9 +39,6 @@ #include #include -static int errno; -#include - #define ENVCTRL_MINOR 162 #define PCF8584_ADDRESS 0x55 -- 2.20.1