remove kbio.h

The old keyboard driver is gone in 2.6, so the only user left are the compat ioctls.

Index: linux-2.6/arch/sparc64/kernel/ioctl32.c
=================================--- linux-2.6.orig/arch/sparc64/kernel/ioctl32.c 2005-11-06 20:22:05.000000000 +0100
+++ linux-2.6/arch/sparc64/kernel/ioctl32.c 2005-11-06 20:22:09.000000000 +0100
@@ -14,7 +14,6 @@
#include <linux/ncp_fs.h>
#include <linux/syscalls.h>
#include <asm/fbio.h>
-#include <asm/kbio.h>
#include <asm/vuid_event.h>
#include <asm/envctrl.h>
#include <asm/display7seg.h>
@@ -471,16 +470,6 @@
COMPATIBLE_IOCTL(FBIOGCURPOS)
COMPATIBLE_IOCTL(FBIOGCURMAX)
/* Little k */
-COMPATIBLE_IOCTL(KIOCTYPE)
-COMPATIBLE_IOCTL(KIOCLAYOUT)
-COMPATIBLE_IOCTL(KIOCGTRANS)
-COMPATIBLE_IOCTL(KIOCTRANS)
-COMPATIBLE_IOCTL(KIOCCMD)
-COMPATIBLE_IOCTL(KIOCSDIRECT)
-COMPATIBLE_IOCTL(KIOCSLED)
-COMPATIBLE_IOCTL(KIOCGLED)
-COMPATIBLE_IOCTL(KIOCSRATE)
-COMPATIBLE_IOCTL(KIOCGRATE)
COMPATIBLE_IOCTL(VUIDSFORMAT)
COMPATIBLE_IOCTL(VUIDGFORMAT)
/* Little v, the video4linux ioctls */
Index: linux-2.6/include/asm-sparc/kbio.h
=================================--- linux-2.6.orig/include/asm-sparc/kbio.h 2005-11-06 20:21:53.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-#ifndef __LINUX_KBIO_H
-#define __LINUX_KBIO_H
-
-/* Return keyboard type */
-#define KIOCTYPE _IOR('k', 9, int)
-/* Return Keyboard layout */
-#define KIOCLAYOUT _IOR('k', 20, int)
-
-enum {

-    TR_NONE,
-    TR_ASCII,			/* keyboard is in regular state */
-    TR_EVENT,			/* keystrokes sent as firm events */
-    TR_UNTRANS_EVENT		/* EVENT+up and down+no translation */

-};
-
-/* Return the current keyboard translation */ -#define KIOCGTRANS _IOR('k', 5, int)
-/* Set the keyboard translation */
-#define KIOCTRANS _IOW('k', 0, int)
-
-/* Send a keyboard command */
-#define KIOCCMD _IOW('k', 8, int)
-
-/* Return if keystrokes are being sent to /dev/kbd */ -
-/* Set routing of keystrokes to /dev/kbd */ -#define KIOCSDIRECT _IOW('k', 10, int)
-
-/* Set keyboard leds */
-#define KIOCSLED _IOW('k', 14, unsigned char)
-
-/* Get keyboard leds */
-#define KIOCGLED _IOR('k', 15, unsigned char)
-
-/* Used by KIOC[GS]RATE */
-struct kbd_rate {
- unsigned char delay; /* Delay in Hz before first repeat. */
- unsigned char rate; /* In characters per second (0..50). */
-};
-
-/* Set keyboard rate */
-#define KIOCSRATE _IOW('k', 40, struct kbd_rate)
-
-/* Get keyboard rate */
-#define KIOCGRATE _IOW('k', 41, struct kbd_rate)
-
-/* Top bit records if the key is up or down */
-#define KBD_UP 0x80
-
-/* Usable information */
-#define KBD_KEYMASK 0x7f
-
-/* All keys up */
-#define KBD_IDLE 0x75
-
-#endif /* __LINUX_KBIO_H */
Index: linux-2.6/include/asm-sparc64/kbio.h
=================================--- linux-2.6.orig/include/asm-sparc64/kbio.h 2005-11-06 20:21:53.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-#ifndef __LINUX_KBIO_H
-#define __LINUX_KBIO_H
-
-/* Return keyboard type */
-#define KIOCTYPE _IOR('k', 9, int)
-/* Return Keyboard layout */
-#define KIOCLAYOUT _IOR('k', 20, int)
-
-enum {

-    TR_NONE,
-    TR_ASCII,			/* keyboard is in regular state */
-    TR_EVENT,			/* keystrokes sent as firm events */
-    TR_UNTRANS_EVENT		/* EVENT+up and down+no translation */

-};
-
-/* Return the current keyboard translation */ -#define KIOCGTRANS _IOR('k', 5, int)
-/* Set the keyboard translation */
-#define KIOCTRANS _IOW('k', 0, int)
-
-/* Send a keyboard command */
-#define KIOCCMD _IOW('k', 8, int)
-
-/* Return if keystrokes are being sent to /dev/kbd */ -
-/* Set routing of keystrokes to /dev/kbd */ -#define KIOCSDIRECT _IOW('k', 10, int)
-
-/* Set keyboard leds */
-#define KIOCSLED _IOW('k', 14, unsigned char)
-
-/* Get keyboard leds */
-#define KIOCGLED _IOR('k', 15, unsigned char)
-
-/* Used by KIOC[GS]RATE */
-struct kbd_rate {
- unsigned char delay; /* Delay in Hz before first repeat. */
- unsigned char rate; /* In characters per second (0..50). */
-};
-
-/* Set keyboard rate */
-#define KIOCSRATE _IOW('k', 40, struct kbd_rate)
-
-/* Get keyboard rate */
-#define KIOCGRATE _IOW('k', 41, struct kbd_rate)
-
-/* Top bit records if the key is up or down */
-#define KBD_UP 0x80
-
-/* Usable information */
-#define KBD_KEYMASK 0x7f
-
-/* All keys up */
-#define KBD_IDLE 0x75
-
-#endif /* __LINUX_KBIO_H */

From: Christoph Hellwig <[email protected]>
Date: Mon, 7 Nov 2005 05:06:57 +0100

Applied, thanks.

There are some references in include/asm-m68k/kbio.h and via Documentation/ioctl-number.txt, you might want to kill those off too :-)

And references in the sunos_ioctl.c files that I missed, so this patch broke compiling with those enabled. Would you mind applying the following patch that kills those two + the m68k and Documentation/ references?

Index: linux-2.6/Documentation/ioctl-number.txt
=================================--- linux-2.6.orig/Documentation/ioctl-number.txt 2005-10-31 12:23:01.000000000 +0100
+++ linux-2.6/Documentation/ioctl-number.txt 2005-11-07 11:43:50.000000000 +0100
@@ -130,8 +130,6 @@
<mailto:[email protected]>
'i' 00-3F linux/i2o.h
'j' 00-3F linux/joystick.h
-'k' all asm-sparc/kbio.h
- asm-sparc64/kbio.h
'l' 00-3F linux/tcfs_fs.h transparent cryptographic file system
<http://mikonos.dia.unisa.it/tcfs>
'l' 40-7F linux/udf_fs_i.h in development:
Index: linux-2.6/arch/sparc/kernel/sunos_ioctl.c
=================================--- linux-2.6.orig/arch/sparc/kernel/sunos_ioctl.c 2005-10-31 12:23:19.000000000 +0100
+++ linux-2.6/arch/sparc/kernel/sunos_ioctl.c 2005-11-07 11:48:09.000000000 +0100
@@ -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;
Index: linux-2.6/arch/sparc64/kernel/sunos_ioctl32.c
=================================--- linux-2.6.orig/arch/sparc64/kernel/sunos_ioctl32.c 2005-10-31 12:23:19.000000000 +0100
+++ linux-2.6/arch/sparc64/kernel/sunos_ioctl32.c 2005-11-07 11:48:20.000000000 +0100
@@ -24,7 +24,6 @@
#include <linux/smp_lock.h>
#include <linux/syscalls.h>
#include <linux/compat.h>
-#include <asm/kbio.h>

#define SUNOS_NR_OPEN 256

Index: linux-2.6/include/asm-m68k/kbio.h
=================================--- linux-2.6.orig/include/asm-m68k/kbio.h 2005-10-31 12:24:06.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include <asm-sparc/kbio.h>

From: Christoph Hellwig <[email protected]>
Date: Mon, 7 Nov 2005 20:30:20 +0100

I will, thanks a lot.