aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/sunos_ioctl32.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-09 19:06:04 -0500
committerPaul Mackerras <paulus@samba.org>2005-11-09 19:06:04 -0500
commit31e7f1ff3c5d39a70da85f7d81a1ab1f4e64fa97 (patch)
treea6cb8f14b1182e5dce55d13e52c1182a8c7e0402 /arch/sparc64/kernel/sunos_ioctl32.c
parentfca5dcd4835ed09bb1a48a355344aff7a25c76e0 (diff)
parent6730c3c14421b7c924d06e31bb66e0adad225547 (diff)
Merge ../linux-2.6
Diffstat (limited to 'arch/sparc64/kernel/sunos_ioctl32.c')
-rw-r--r--arch/sparc64/kernel/sunos_ioctl32.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/sunos_ioctl32.c b/arch/sparc64/kernel/sunos_ioctl32.c
index 7654b8a7f03a..3f619ead22cc 100644
--- a/arch/sparc64/kernel/sunos_ioctl32.c
+++ b/arch/sparc64/kernel/sunos_ioctl32.c
@@ -24,7 +24,6 @@
24#include <linux/smp_lock.h> 24#include <linux/smp_lock.h>
25#include <linux/syscalls.h> 25#include <linux/syscalls.h>
26#include <linux/compat.h> 26#include <linux/compat.h>
27#include <asm/kbio.h>
28 27
29#define SUNOS_NR_OPEN 256 28#define SUNOS_NR_OPEN 256
30 29