diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-24 23:38:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-24 23:38:44 -0400 |
commit | e89227889cec6b66758b44c83f78dba337e5d699 (patch) | |
tree | 44fbf495ca2d0827e44bcc449a0f5177228dbdd8 /drivers/sbus/char/bbc_envctrl.c | |
parent | 4e8fd22bd421d7aa279bcb76189505a1f96bb7bf (diff) | |
parent | db7d9a4eb700be766cc9f29241483dbb1e748832 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers/sbus/char/bbc_envctrl.c')
-rw-r--r-- | drivers/sbus/char/bbc_envctrl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c index d5259f7fee6d..b8a2c7353b0a 100644 --- a/drivers/sbus/char/bbc_envctrl.c +++ b/drivers/sbus/char/bbc_envctrl.c | |||
@@ -4,13 +4,14 @@ | |||
4 | * Copyright (C) 2001 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 2001 David S. Miller (davem@redhat.com) |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #define __KERNEL_SYSCALLS__ | ||
8 | |||
7 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
8 | #include <linux/sched.h> | 10 | #include <linux/sched.h> |
9 | #include <linux/slab.h> | 11 | #include <linux/slab.h> |
10 | #include <linux/delay.h> | 12 | #include <linux/delay.h> |
11 | #include <asm/oplib.h> | 13 | #include <asm/oplib.h> |
12 | #include <asm/ebus.h> | 14 | #include <asm/ebus.h> |
13 | #define __KERNEL_SYSCALLS__ | ||
14 | static int errno; | 15 | static int errno; |
15 | #include <asm/unistd.h> | 16 | #include <asm/unistd.h> |
16 | 17 | ||