summaryrefslogtreecommitdiff
path: root/arch/sparc/kernel/sunos_ioctl.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-10 11:06:04 +1100
committerPaul Mackerras <paulus@samba.org>2005-11-10 11:06:04 +1100
commit31e7f1ff3c5d39a70da85f7d81a1ab1f4e64fa97 (patch)
treea6cb8f14b1182e5dce55d13e52c1182a8c7e0402 /arch/sparc/kernel/sunos_ioctl.c
parentfca5dcd4835ed09bb1a48a355344aff7a25c76e0 (diff)
parent6730c3c14421b7c924d06e31bb66e0adad225547 (diff)
Merge ../linux-2.6
Diffstat (limited to 'arch/sparc/kernel/sunos_ioctl.c')
-rw-r--r--arch/sparc/kernel/sunos_ioctl.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/kernel/sunos_ioctl.c b/arch/sparc/kernel/sunos_ioctl.c
index df1c0b31a930..a6ba3d26222c 100644
--- a/arch/sparc/kernel/sunos_ioctl.c
+++ b/arch/sparc/kernel/sunos_ioctl.c
@@ -23,7 +23,6 @@
#include <linux/smp_lock.h>
#include <linux/syscalls.h>
#include <linux/file.h>
-#include <asm/kbio.h>
#if 0
extern char sunkbd_type;